Changeset 239 for trunk/SRC/Colors

Timestamp:

03/28/07 08:50:03 (17 years ago)

Author:

smasson

Message:

cleaning + minor bugfix related to the path definition

Location:

trunk/SRC/Colors

Files:

• lct.pro (modified) (1 diff)
• newpalette.pro (modified) (1 diff)
• xlct.pro (modified) (1 diff)

trunk/SRC/Colors/lct.pro

@@ -43 +43 @@
 ; definition of the name of the file containing colors palettes.
   if keyword_set(file) then nametbl = file ELSE nametbl = 'palette.tbl'
-; What is the full address of nametbl?
-  thisOS = strupcase(strmid(!version.os_family, 0, 3))
-  CASE thisOS of
-  'MAC':BEGIN & sep = ':' & pathsep = ',' & end
-  'WIN':BEGIN & sep = '\' & pathsep = ';' & end
-  ELSE: BEGIN & sep = '/' & pathsep = ':' & end
-  ENDCASE
-  cd, current = current
-  if strpos(nametbl, sep) lt 0 then BEGIN
-    if rstrpos(current, sep) NE strlen(current)-1 then current = current+sep
-    multipath = str_sep(!path, pathsep)
-    for i = 0, n_elements(multipath)-1 do $
-       if rstrpos(multipath[i], sep) NE strlen(multipath[i])-1 then $
-          multipath[i] = multipath[i] +sep
-    nametbl = [current, multipath]+ nametbl
-  ENDIF
-; we test all possible name in order to find where file is.
-  nfile = n_elements(nametbl)
-  n = 0
-  repeat begin
-    res = findfile(nametbl[n])
-    n = n+1
-  endrep until res[0] NE '' OR n EQ n_elements(nametbl)
-  if res[0] NE '' then BEGIN
-    nametbl = nametbl[n-1]
+; look for nametbl file
+  nametbl = (find(nametbl, /firstfound, /nopro))[0]
+  if nametbl NE 'NOT FOUND' then BEGIN
     if n_elements(ex) NE 0 then $
        if (where(tag_names(ex) EQ 'FILE'))[0] NE -1 then ex.FILE = nametbl

trunk/SRC/Colors/newpalette.pro

@@ -35 +35 @@
   compile_opt idl2, strictarrsubs
 ;
+@cm_general
+;
+  homedir = isadirectory(homedir,  title = 'select MyIDL directory')
 ; definition of the name of the file containing colors palettes.
   if keyword_set(file) then nametbl = file ELSE nametbl = 'palette.tbl'
-; What is the full adress of nametbl?
-  homedir = isadirectory(homedir,  title = 'select MyIDL directory')
+; look for nametbl file
   namesave = nametbl
-  nametbl = find(nametbl)
-  if nametbl[0] NE 'NOT FOUND' then begin
-    nametbl = nametbl[0]
-    nameshort = file_basename(nametbl)
-; is nametbl belongs to the same effective user ID (UID) as the IDL process?
-    IF !d.name EQ 'X' THEN BEGIN ; works only for unix tye machine
-      IF file_test(nametbl, /user) NE 1 THEN BEGIN
-        noanswer = report('The file '+nametbl+' is not yours... Do you want to copy '+nameshort+' in your MyIDL directory: '+homedir+' ?', /default_no, /question)
-        IF noanswer THEN return ELSE BEGIN
-          file_copy, nametbl, homedir  ; copy the file
-          nametbl = homedir + nametbl  ; update its name
-        ENDELSE
-      ENDIF
-    ENDIF
-; no file nametbl found
-    ENDIF ELSE BEGIN
+  nametbl = (find(nametbl, /firstfound, /nopro))[0]
+; no file nametbl found, do we create one?
+  if nametbl EQ 'NOT FOUND' then BEGIN
       nametbl = file_basename(namesave)        ; get back the original nametbl
-      noanswer = report('The file '+nametbl+' was not found !path directories... Do you want to create such a file in  your MyIDL directory: '+homedir+' ?', /default_no, /question)
+      noanswer = report(['The file '+nametbl+' was not found !path directories.' $
+                         , 'Do you want to create such a file in your MyIDL directory: '+homedir+' ?'] $
+                        , /default_no, /question)
       if NOT noanswer then return
       nameorg = filepath('colors1.tbl', subdir = ['resource', 'colors'])
-      file_copy, nameorg, homedir
+      nametbl = homedir + file_basename(nametbl) ; update its name
+      file_copy, nameorg, nametbl                ; copy the file
+      file_chmod, nametbl, /u_write              ; make sure we have write access
+  ENDIF
+; do we have write access?
+  IF file_test(nametbl, /write) EQ 0 THEN BEGIN 
+    noanswer = report(['You have no write access on file '+nametbl $
+                       , 'Do you want to copy '+nameshort+' in your MyIDL directory: '+homedir+' ?'] $
+                      , /default_no, /question)
+    IF noanswer THEN return ELSE BEGIN
+      nametbl = homedir + file_basename(nametbl) ; update its name
+      file_copy, nametbl, homedir, /allow_same   ; copy the file
+      file_chmod, nametbl, /u_write              ; make sure we have write access
     ENDELSE
-; is nametbl writable?
-    IF file_test(nametbl, /write) NE 1 THEN file_chmod, nametbl, /u_write
+  ENDIF 
 ; make sure that we will really use nametbl name even if _EXTRA keyword is used
     if n_elements(ex) NE 0 then $

trunk/SRC/Colors/xlct.pro

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