Changeset 61

Timestamp:

03/03/08 16:59:10 (16 years ago)

Author:

kolasinski

Message:

change str_sep to strsplit in def_dbase

File:

• trunk/procs/def_dbase.pro (modified) (4 diffs)

trunk/procs/def_dbase.pro

@@ -14 +14 @@
 
    WHILE ibase LE nbases - 1 DO BEGIN
-      argvar = str_sep(strcompress(strtrim((spec_bases(ibase))[0], 2)), ' ')
+      argvar = strsplit((spec_bases(ibase))[0], ' ', /EXTRACT)
       IF strpos(expid,  argvar[0]) NE -1 THEN BEGIN 
-         database = (str_sep(strcompress(strtrim((spec_bases(ibase))[0], 2)), ' '))[2]
+         database = (strsplit((spec_bases(ibase))[0], ' ', /EXTRACT))[2]
          GOTO,  fin 
       ENDIF 
@@ -28 +28 @@
 
    WHILE ibase LE nbase - 1 DO BEGIN
-      argvar = str_sep(strcompress(strtrim((data_bases(ibase))[0], 2)), ' ')
+      argvar = strsplit((data_bases(ibase))[0], ' ', /EXTRACT)
       IF strmid(argvar[0], 0, strlen(argvar[0])-3) EQ expid THEN BEGIN 
-         database = (str_sep(strcompress(strtrim((data_bases(ibase))[0], 2)), ' '))[2]
+         database = (strsplit((data_bases(ibase))[0], ' ', /EXTRACT))[2]
          GOTO, fin 
       ENDIF 
@@ -39 +39 @@
 
    ibase = 0
-   database = (str_sep(strcompress(strtrim((data_bases(ibase))[0], 2)), ' '))[2]
+   database = (strsplit((data_bases(ibase))[0], ' ', /EXTRACT))[2]
 
 fin:
@@ -45 +45 @@
 
    ind1 = strpos(database, '<')
-   IF ind1 NE -1 THEN BEGIN 
-      chain1 = str_sep(database, '<')
-      chain2 = str_sep(chain1[1], '>')
-      command = 'path_var = '+chain2[0]
+   IF ind1 NE -1 THEN BEGIN
+      database_split = strsplit(database, '<>', /EXTRACT)
+      path_base = database_split[1]
+      command = 'path_var = '+path_base
       res = execute(command)
-      IF strpos(chain2[1], '/') EQ 0 THEN chain2[1] = strmid(chain2[1], 1, strlen(chain2[1])-1)
-      database = chain1[0]+path_var+chain2[1]
+      database_split[1] = path_var
+      database = strjoin(database_split)
+      database = strsed(database, '//', '/')
    ENDIF