Changeset 7016 for trunk/psModules/src/astrom/pmConceptsWrite.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/pmConceptsWrite.c (modified) (5 diffs)

trunk/psModules/src/astrom/pmConceptsWrite.c

@@ -35 +35 @@
         switch (standard->type) {
         case PS_DATA_STRING:
-            sList = psStringSplit(standard->data.V, " ;");
+            sList = psStringSplit(standard->data.V, " ;", true);
             break;
         case PS_DATA_LIST:
@@ -173 +173 @@
             return false;
         }
-        psList *keys = psStringSplit(keywords, " ,;"); // List of keywords
+        psList *keys = psStringSplit(keywords, " ,;", true); // List of keywords
         if (keys->n != values->n) {
             psLogMsg(__func__, PS_LOG_WARN, "Number of keywords (%d) does not match number of values (%d).\n",
@@ -363 +363 @@
                     continue;
                 }
-                psList *keywords = psStringSplit(headerItem->data.V, " ,;"); // List of header keywords
+                psList *keywords = psStringSplit(headerItem->data.V, " ,;", true); // List of header keywords
                 if (formatted->type == PS_DATA_LIST) {
                     psList *values = formatted->data.V; // The values for the headers
@@ -448 +448 @@
                 // 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) {
@@ -708 +708 @@
         // 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) {