[Sashimi-commit] SF.net SVN: sashimi:[4727] branches/autotools/trans_proteomic_pipeline/src/ mzXML/tools/mzXMLIndexer/indexmzXML.cpp

[<spa...@us...>]

Revision: 4727
          http://sashimi.svn.sourceforge.net/sashimi/?rev=4727&view=rev
Author:   spacepod
Date:     2009-10-28 23:53:08 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
[indexmzXML] trying to deal with different sizes of #define'd STREAMOFFSET

Modified Paths:
--------------
    branches/autotools/trans_proteomic_pipeline/src/mzXML/tools/mzXMLIndexer/indexmzXML.cpp

Modified: branches/autotools/trans_proteomic_pipeline/src/mzXML/tools/mzXMLIndexer/indexmzXML.cpp
===================================================================
--- branches/autotools/trans_proteomic_pipeline/src/mzXML/tools/mzXMLIndexer/indexmzXML.cpp	2009-10-28 22:36:51 UTC (rev 4726)
+++ branches/autotools/trans_proteomic_pipeline/src/mzXML/tools/mzXMLIndexer/indexmzXML.cpp	2009-10-28 23:53:08 UTC (rev 4727)
@@ -281,7 +281,24 @@
    {
       if (pScanIndex[i] > 0)
       {
-         fprintf(pFP2, "    <offset id=\"%ld\">%ld</offset>\n", i, pScanIndex[i]);
+
+
+         long int olongint;
+         long long olonglongint;
+
+         if (sizeof(STREAMOFFSET) == 4) {
+	   olongint = pScanIndex[i];
+	   fprintf(pFP2, "    <offset id=\"%ld\">%ld</offset>\n", i, olongint);
+	 }
+	 else if (sizeof(STREAMOFFSET) == 8) {
+	   olonglongint = pScanIndex[i];
+	   fprintf(pFP2, "    <offset id=\"%ld\">%lld</offset>\n", i, olonglongint);
+	 }
+	 else {
+	   puts("unknown compiler options");
+	   exit(1);
+	 }
+
       }
       fflush(pFP2);
    }
@@ -502,11 +519,32 @@
       {
          if (pScanIndexToValidate[n] != pScanIndex[n])
          {
-	   printf("The index is corrupted: (scan %ld) %ld vs %ld\n",
-		  n, pScanIndexToValidate[n], pScanIndex[n]);
-            ADD_INDEX(szInput, pFP);
-            printf("Done\n");
-            break;
+
+	   long int olongintA;
+	   long int olongintB;
+	   long long olonglongintA;
+	   long long olonglongintB;
+
+	   if (sizeof(STREAMOFFSET) == 4) {
+	     olongintA = pScanIndex[n];
+	     olongintB = pScanIndexToValidate[n];
+	     printf("The index is corrupted: (scan %ld) %ld vs %ld\n",
+		    n, olongintB, olongintA);
+	   }
+	   else if (sizeof(STREAMOFFSET) == 8) {
+	     olonglongintA = pScanIndex[n];
+	     olonglongintB = pScanIndexToValidate[n];
+	     printf("The index is corrupted: (scan %ld) %lld vs %lld\n",
+		    n, olonglongintB, olonglongintA);
+	   }
+	   else {
+	     puts("unknown compiler options");
+	     exit(1);
+	   }
+
+	   ADD_INDEX(szInput, pFP);
+	   printf("Done\n");
+	   break;
          }
       }
    }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.