Changeset 285

Timestamp:

09/14/07 13:05:09 (17 years ago)

Author:

smasson

Message:

allways return back a scalar is /firstfound used

Location:

trunk/SRC

Files:

• Colors/lct.pro (modified) (1 diff)
• Colors/newpalette.pro (modified) (1 diff)
• Colors/xlct.pro (modified) (1 diff)
• ToBeReviewed/WIDGET/AUTOUR_de_XXX/loadgrid.pro (modified) (2 diffs)
• ToBeReviewed/WIDGET/AUTOUR_de_XXX/selectfile.pro (modified) (2 diffs)
• Utilities/find.pro (modified) (2 diffs)
• Utilities/protype.pro (modified) (1 diff)
• Utilities/xfile.pro (modified) (1 diff)
• Utilities/xhelp.pro (modified) (1 diff)

trunk/SRC/Colors/lct.pro

@@ -44 +44 @@
   if keyword_set(file) then nametbl = file ELSE nametbl = 'palette.tbl'
 ; look for nametbl file
-  nametbl = (find(nametbl, /firstfound, /nopro))[0]
+  nametbl = find(nametbl, /firstfound, /nopro)
   if nametbl NE 'NOT FOUND' then BEGIN
     if n_elements(ex) NE 0 then $

trunk/SRC/Colors/newpalette.pro

@@ -42 +42 @@
 ; look for nametbl file
   namesave = nametbl
-  nametbl = (find(nametbl, /firstfound, /nopro))[0]
+  nametbl = find(nametbl, /firstfound, /nopro)
 ; no file nametbl found, do we create one?
   if nametbl EQ 'NOT FOUND' then BEGIN

trunk/SRC/Colors/xlct.pro

@@ -501 +501 @@
 ;-----------------------------------------------------------------------------
    IF N_ELEMENTS(file) GT 0 THEN filename = file ELSE BEGIN
-      filename = (find('palette.tbl', /firstfound, /nopro))[0]
+      filename = find('palette.tbl', /firstfound, /nopro)
       if filename EQ 'NOT FOUND' then filename=filepath('colors1.tbl',subdir=['resource', 'colors'])
    ENDELSE

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/loadgrid.pro

@@ -40 +40 @@
   meshfile = strtrim(meshfile, 2)
 ; try to find a .pro file with this name...
-  filepro = (find(meshfile[0], /firstfound, /onlypro))[0]
+  filepro = find(meshfile[0], /firstfound, /onlypro)
 ; if this is an idl batch file or a procedure
   if filepro NE 'NOT FOUND' THEN BEGIN
@@ -52 +52 @@
     ENDCASE
   ENDIF ELSE BEGIN
-    filenc = (find(meshfile[0], /firstfound, /onlync))[0]
+    filenc = find(meshfile[0], /firstfound, /onlync)
     if filenc EQ 'NOT FOUND' THEN stop
     listing = 'initncdf, ''' + filenc +''''

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/selectfile.pro

@@ -85 +85 @@
     'meshload':BEGIN
       widget_control, event.id, get_value = filename
-      filename = (find(filename[0], /onlypro, /firstfound))[0]
+      filename = find(filename[0], /onlypro, /firstfound)
       if filename EQ 'NOT FOUND' then begin
         widget_control, event.id, set_value = ''
@@ -150 +150 @@
           meshload = meshload[0]
           IF meshload EQ '' THEN return
-          meshload = (find(meshload[0], /onlypro, /firstfound))[0]
+          meshload = find(meshload[0], /onlypro, /firstfound)
           if meshload EQ 'NOT FOUND' then begin
             widget_control, meshload_id, set_value = ''

trunk/SRC/Utilities/find.pro

@@ -20 +20 @@
 ;
 ; @keyword FIRSTFOUND
-; activate this keyword to stop looking for the file as soon as we found one.
+; activate this keyword to stop looking for the file as soon as we
+; found one. Return a scalar string containing the first file found
 ;
 ; @keyword IODIRECTORY {type=scalar string or array of strings} {default=['.',!path]}
@@ -164 +165 @@
     ENDIF ELSE found = file_search(dir + '/' + base, _extra = ex)
     IF found[0] NE '' THEN BEGIN
-      IF keyword_set(firstfound) THEN BEGIN
-        IF keyword_set(unique) THEN return, found[uniq(found, sort(found))] $
-        ELSE return, found
-      ENDIF
+      IF keyword_set(firstfound) THEN return, found[0]
       fileout = [fileout, found]
     ENDIF

trunk/SRC/Utilities/protype.pro

@@ -40 +40 @@
   compile_opt idl2, strictarrsubs
 ;
-  filepro = (find(file[0], /onlypro, /firstfound))[0]
+  filepro = find(file[0], /onlypro, /firstfound)
   if filepro EQ 'NOT FOUND' then return, -1
   name = file_basename(filepro, '.pro')

trunk/SRC/Utilities/xfile.pro

@@ -65 +65 @@
 ;
 ; find the file and display it!
-   pfile = find(filename, /first_found)
+   pfile = find(filename, /firstfound)
    if (pfile NE 'NOT FOUND') then begin
      xdisplayfile, pfile[0], _EXTRA = ex

trunk/SRC/Utilities/xhelp.pro

@@ -68 +68 @@
 ;
 ; find the file and display it!
-   pfile = (find(filename, /first_found))[0]
+   pfile = find(filename, /firstfound)
 ; read it
    IF (pfile NE 'NOT FOUND') THEN BEGIN