Merge pull request #10 from italiangrid/develop

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for storm frontend server 1.8.7.
+# Generated by GNU Autoconf 2.63 for storm frontend server 1.8.8.
 #
 # Report bugs to <[email protected]>.
 #
@@ -749,8 +749,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='storm frontend server'
 PACKAGE_TARNAME='storm-frontend-server'
-PACKAGE_VERSION='1.8.7'
-PACKAGE_STRING='storm frontend server 1.8.7'
+PACKAGE_VERSION='1.8.8'
+PACKAGE_STRING='storm frontend server 1.8.8'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_unique_file="src/frontend/storm-frontend.cpp"
@@ -1565,7 +1565,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures storm frontend server 1.8.7 to adapt to many kinds of systems.
+\`configure' configures storm frontend server 1.8.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1636,7 +1636,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of storm frontend server 1.8.7:";;
+     short | recursive ) echo "Configuration of storm frontend server 1.8.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1795,7 +1795,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-storm frontend server configure 1.8.7
+storm frontend server configure 1.8.8
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1813,7 +1813,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by storm frontend server $as_me 1.8.7, which was
+It was created by storm frontend server $as_me 1.8.8, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2666,7 +2666,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='storm-frontend-server'
- VERSION='1.8.7'
+ VERSION='1.8.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21395,7 +21395,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by storm frontend server $as_me 1.8.7, which was
+This file was extended by storm frontend server $as_me 1.8.8, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21458,7 +21458,7 @@ Report bugs to <[email protected]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-storm frontend server config.status 1.8.7
+storm frontend server config.status 1.8.8
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ([2.59])
-AC_INIT([storm frontend server], [1.8.7], [email protected])
+AC_INIT([storm frontend server], [1.8.8], [email protected])
 
 AC_CONFIG_AUX_DIR([./aux])
 AC_CONFIG_MACRO_DIR([m4])

src/frontend/file_request.hpp

@@ -27,6 +27,7 @@ extern "C" {
 #include <vector>
 #include <string>
 #include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/algorithm/string/replace.hpp>
 
 #include "storm_exception.hpp"
 #include "srmv2H.h"
@@ -152,11 +153,10 @@ class file_request {
     std::string sqlFormat(bool b){
     	return b ? "1" : "0";
     }
+
     std::string sqlFormat(std::string const& s){
-    	std::string formatted_s("\'");
-    	formatted_s += s;
-    	formatted_s += '\'';
-    	return formatted_s;
+    	std::string formatted_s = boost::replace_all_copy(s, "'", "''");
+    	return '\'' + formatted_s + '\'';
     }
 
 	void setFileStorageType(ns1__TFileStorageType type) {