Changeset 197 for trunk

Timestamp:

10/26/06 12:45:17 (18 years ago)

Author:

smasson

Message:

add 2 routines + fix minor bugfix

Location:

trunk/SRC

Files:

• Documentation/xmldoc/savesaxo.sh (modified) (2 diffs)
• Grid/checkperio.pro (added)
• Grid/numbisland.pro (added)
• Utilities/mergeonline_help.pro (modified) (4 diffs)

trunk/SRC/Documentation/xmldoc/savesaxo.sh

@@ -573 +573 @@
     # copy files in a temporary directory
     mkdir /tmp/download_${$}/
-    cp -rp ../xmldoc/ /tmp/download_${$}/
+    cp -rp ../xmldoc /tmp/download_${$}/
     cp -rp ../idldoc_html_output /tmp/download_${$}/
     #
@@ -594 +594 @@
      mv ${file_html}_${$} ${file_html}
     done
-    scp -rp /tmp/download_${$}/* ${lgforge}@forge.ipsl.jussieu.fr:/ipsl/forge/projets/saxo/download/
+    echo
+    echo give SAXO password if asked
+    scp -rp /tmp/download_${$}/* saxo@forge.ipsl.jussieu.fr:/ipsl/forge/projets/saxo/download/
     rm -rf /tmp/download_${$}/
 fi

trunk/SRC/Utilities/mergeonline_help.pro

@@ -6 +6 @@
 ; Documentation
 ;
-; @uses
-; mergeonline_help.sh
-;
 ; @restrictions
-; Works only with "Unix" type machine
 ; Needs at least version 6.2 
 ;
@@ -24 +20 @@
 ;
 ; is the IDL version at least 6.2 ?
-  IF float(strmid(!version.release, 0, 3)) LT 6.2 THEN BEGIN
+  idlversion = float(strmid(!version.release, 0, 3))
+  IF idlversion LT 6.2 THEN BEGIN
     print, 'Warning: You need at least IDL 6.2 to use SAXO/IDL merged online help'
     return
@@ -57 +54 @@
   IF homesrc EQ '' THEN return
 
-  homesaxo = file_dirname(find('buildinit.pro'), /mark_directory) + 'Documentation/idldoc_assistant_output/'
+  homesaxo = file_dirname((find('buildinit.pro'))[0], /mark_directory) + 'Documentation/idldoc_assistant_output/'
   IF file_test(homesaxo + 'idldoc-lib.adp') EQ 0 THEN BEGIN
     print, 'Error when looking for the file '+ homesaxo + 'idldoc-lib.adp...'
@@ -84 +81 @@
 ; are the 2 revision tags the same??
         IF array_equal(old, new) THEN BEGIN
-          !help_path = homesrc
-          print, 'Use SAXO/IDL merged online help...'
-          return
+; is IDL version the same of homesrc + 'home.html' ?
+          homehtml = getfile(homesrc+'home.html')
+          line = strmatch(homehtml, '*IDL '+ string(idlversion, format = '(f3.1)') + '*')
+          line = (where(line EQ 1))[0]
+          IF line NE -1 THEN  BEGIN
+            !help_path = homesrc
+            print, 'Use SAXO/IDL merged online help...'
+            return
+          ENDIF
         ENDIF
       ENDIF