Changeset 7016 for trunk/psModules/src/astrom/pmFPAConceptsSet.c

Timestamp:

Apr 30, 2006, 3:08:45 PM (20 years ago)

Author:

magnier

Message:

fixed instances of psStringSplit to use new API

File:

• trunk/psModules/src/astrom/pmFPAConceptsSet.c (modified) (4 diffs)

trunk/psModules/src/astrom/pmFPAConceptsSet.c

@@ -249 +249 @@
         // Now, need to get the "given"s
         if (strlen(givenCols) || strlen(givenPS)) {
-            psList *cols = psStringSplit(givenCols, ",;"); // List of column names
-            psList *values = psStringSplit(givenPS, ",;"); // List of value names for the columns
+            psList *cols = psStringSplit(givenCols, ",;", true); // List of column names
+            psList *values = psStringSplit(givenPS, ",;", true); // List of value names for the columns
             psMetadata *selection = psMetadataAlloc(); // The stuff to select in the DB
             if (cols->n != values->n) {
@@ -617 +617 @@
                 // Check that it's the same value as stored in the camera
                 psString checkString = psMetadataLookupStr(NULL, cell->camera, "CELL.BIASSEC");
-                psList *checkList = psStringSplit(checkString, " ;");
+                psList *checkList = psStringSplit(checkString, " ;", true);
                 if (biassecs->n != checkList->n) {
                     psError(PS_ERR_IO, true, "Target CELL.BIASSEC is specified by value, but number of "
@@ -663 +663 @@
             } else if (strcasecmp(source, "HEADER") == 0) {
                 psString keywordsString = psMetadataLookupStr(NULL, cell->camera, "CELL.BIASSEC");
-                psList *keywords = psStringSplit(keywordsString, " ,;");
+                psList *keywords = psStringSplit(keywordsString, " ,;", true);
                 if (biassecs->n != keywords->n) {
                     psError(PS_ERR_IO, true, "Target CELL.BIASSEC is sepcified by headers, but the number "
@@ -825 +825 @@
                     psMetadata *translation = psMetadataLookupMD(NULL, camera, "TRANSLATION");
                     psString keywords = psMetadataLookupStr(NULL, translation, "CELL.TIME");
-                    psList *dateTimeKeywords = psStringSplit(keywords, " ,;");
+                    psList *dateTimeKeywords = psStringSplit(keywords, " ,;", true);
                     psString dateKeyword = psListGet(dateTimeKeywords, PS_LIST_HEAD);
                     psString timeKeyword = psListGet(dateTimeKeywords, PS_LIST_TAIL);
 
-                    psList *dateTime = psStringSplit(dateTimeString, " T"); // Find the middle T
+                    psList *dateTime = psStringSplit(dateTimeString, " T", true); // Find the middle T
                     psString dateString = psListGet(dateTime, PS_LIST_HEAD);
                     psString timeString = psListGet(dateTime, PS_LIST_TAIL);