Merge pull request #9 from guoci/master

Bugfixes involving string literals and character literals

Author: Michael Hoopmann

include/MSReader.h

@@ -93,7 +93,7 @@ class MSReader {
   void setPrecisionInt(int i);
   void setPrecisionMZ(int i);
   void writeFile(const char* c, bool text, MSObject& m);
-  void writeFile(const char* c, MSFileFormat ff, MSObject& m, char* sha1Report='\0');
+  void writeFile(const char* c, MSFileFormat ff, MSObject& m, const char* sha1Report="\0");
 
   bool readMGFFile(const char* c, Spectrum& s); //Note, no random-access of MGF files.
   bool readMSTFile(const char* c, bool text, Spectrum& s, int scNum=0);
@@ -193,7 +193,7 @@ class MSReader {
   void sql_stmt(const char* stmt);
   bool executeSqlStmt(Spectrum& s, char* zSql);
   void appendFile(Spectrum& s);
-  void writeSqlite(const char* c, MSObject& m, char* sha1Report);
+  void writeSqlite(const char* c, MSObject& m, const char* sha1Report);
   void readChargeTable(int scanID, Spectrum& s);
   vector<int> estimateCharge(Spectrum& s);
   #endif 

src/MSToolkit/MSReader.cpp

@@ -945,7 +945,7 @@ void MSReader::writeFile(const char* c, bool text, MSObject& m){
 	fclose(fileOut);
 }
 
-void MSReader::writeFile(const char* c, MSFileFormat ff, MSObject& m, char* sha1Report){
+void MSReader::writeFile(const char* c, MSFileFormat ff, MSObject& m, const char* sha1Report){
 
   switch(ff){
   case mgf:
@@ -1006,7 +1006,7 @@ void MSReader::writeFile(const char* c, MSFileFormat ff, MSObject& m, char* sha1
 }
 
 #ifndef _NOSQLITE
-void MSReader::writeSqlite(const char* c, MSObject& m, char* sha1Report)
+void MSReader::writeSqlite(const char* c, MSObject& m, const char* sha1Report)
 {
 
   //open the database for write
@@ -1051,7 +1051,7 @@ void MSReader::writeSqlite(const char* c, MSObject& m, char* sha1Report)
   string instrumentType="=";
   for(int i=0; i<16; i++)
     {
-      if(m.getHeader().header[i] != '\0')
+      if(*m.getHeader().header[i] != '\0')
 	{
 	  string headerLine = m.getHeader().header[i];
 	  if(headerLine.find("CreationDate") != string::npos)