Changeset 10447

Timestamp:

Dec 4, 2006, 12:21:28 PM (19 years ago)

Author:

Paul Price

Message:

Propagating API change to psStringSubstitute

Location:

trunk/psModules/src

Files:

• camera/pmFPAConstruct.c (modified) (2 diffs)
• camera/pmFPAfile.c (modified) (8 diffs)
• concepts/pmConceptsStandard.c (modified) (1 diff)
• config/pmConfig.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -233 +233 @@
         const char *name = psMetadataLookupStr(&mdok, chip->concepts, "CHIP.NAME");
         if (mdok && name && strlen(name) > 0) {
-            contentKey = psStringSubstitute(contentKey, name, "{CHIP.NAME}");
+            psStringSubstitute(&contentKey, name, "{CHIP.NAME}");
         }
     }
@@ -245 +245 @@
         const char *name = psMetadataLookupStr(&mdok, cell->concepts, "CELL.NAME");
         if (mdok && name && strlen(name) > 0) {
-            contentKey = psStringSubstitute(contentKey, name, "{CELL.NAME}");
+            psStringSubstitute(&contentKey, name, "{CELL.NAME}");
         }
     }

trunk/psModules/src/camera/pmFPAfile.c

@@ -182 +182 @@
         char *name = psMetadataLookupStr (NULL, file->names, "OUTPUT");
         if (name != NULL) {
-            newName = psStringSubstitute (newName, name, "{OUTPUT}");
+            psStringSubstitute(&newName, name, "{OUTPUT}");
         }
     }
@@ -190 +190 @@
             char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
             if (name != NULL) {
-                newName = psStringSubstitute (newName, name, "{CHIP.NAME}");
+                psStringSubstitute(&newName, name, "{CHIP.NAME}");
             }
         }
@@ -201 +201 @@
             psStringAppend (&name, "%02d", view->chip);
         }
-        newName = psStringSubstitute (newName, name, "{CHIP.N}");
+        psStringSubstitute(&newName, name, "{CHIP.N}");
         psFree (name);
     }
@@ -209 +209 @@
             char *name = psMetadataLookupStr (NULL, cell->concepts, "CELL.NAME");
             if (name != NULL) {
-                newName = psStringSubstitute (newName, name, "{CELL.NAME}");
+                psStringSubstitute(&newName, name, "{CELL.NAME}");
             }
         }
@@ -220 +220 @@
             psStringAppend (&name, "%02d", view->cell);
         }
-        newName = psStringSubstitute (newName, name, "{CELL.N}");
+        psStringSubstitute(&newName, name, "{CELL.N}");
     }
     if (strstr (newName, "{EXTNAME}") != NULL) {
         pmHDU *hdu = pmFPAviewThisHDU (view, file->fpa);
         if (hdu->extname && *hdu->extname) {
-            newName = psStringSubstitute (newName, hdu->extname, "{EXTNAME}");
+            psStringSubstitute(&newName, hdu->extname, "{EXTNAME}");
         }
     }
@@ -232 +232 @@
             char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.FILTER");
             if (name && *name) {
-                newName = psStringSubstitute (newName, name, "{FILTER}");
+                psStringSubstitute(&newName, name, "{FILTER}");
             }
         }
@@ -242 +242 @@
             char *name = psStringCopy ("isp");
             if (name && *name) {
-                newName = psStringSubstitute (newName, name, "{CAMERA}");
+                psStringSubstitute(&newName, name, "{CAMERA}");
             }
             psFree (name);
@@ -254 +254 @@
                 char *ID = psMetadataLookupStr (NULL, filterTable, filterName);
                 if (ID && *ID) {
-                    newName = psStringSubstitute (newName, ID, "{FILTER.ID}");
+                    psStringSubstitute(&newName, ID, "{FILTER.ID}");
                 }
             }

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -324 +324 @@
     // Need TIMESYS first
     psString timesysName = psStringCopy(pattern->name); // e.g., "CELL.TIME" --> "CELL.TIMESYS"
-    timesysName = psStringSubstitute(timesysName, "TIMESYS", "TIME");
+    psStringSubstitute(&timesysName, "TIMESYS", "TIME");
     bool mdok = false;                  // Result of MD lookup
     psTimeType timeSys;                 // The time system

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-04 20:41:51 $
+ *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-04 22:21:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
 
         psTrace("psModules.config", 7, "Replacing %s with %s in directory %s\n", envvar, valueSlash, dir);
-        dir = psStringSubstitute(dir, valueSlash, envvar);
+        psStringSubstitute(&dir, valueSlash, envvar);
         psFree(envvar);
         psFree(valueSlash);
@@ -831 +831 @@
     // strip file:// from front of name
     if (!strncasecmp (newName, "file://", strlen("file://"))) {
-        newName = psStringSubstitute (newName, "", "file://");
+        psStringSubstitute(&newName, "", "file://");
     }