Changeset 259

Timestamp:

08/20/07 16:03:17 (17 years ago)

Author:

pinsard

Message:

improvment of links in idldoc outputs by modification of shell script and some pro files. add test for pro2href.sh. see 62

Location:

trunk/SRC

Files:

• Documentation/xmldoc/pro2href.sh (modified) (4 diffs)
• Documentation/xmldoc/pro2href_t.sh (added)
• Interpolation/angle.pro (modified) (2 diffs)
• Postscript/closeps.pro (modified) (1 diff)
• ToBeReviewed/PLOTS/DESSINE/pltv.pro (modified) (1 diff)
• ToBeReviewed/PLOTS/DIVERS/placedessin.pro (modified) (1 diff)

trunk/SRC/Documentation/xmldoc/pro2href.sh

@@ -8 +8 @@
 # update :
 # $Id$
+# fplod 2007-08-20T11:25:39Z aedon.locean-ipsl.upmc.fr (Darwin)
+# correction from 
+# 4.11. How do I match only the first occurrence of a pattern?
+# in sed faq http://www.student.northpark.edu/pemente/sed/sedfaq4.html#s4.11
 #++ still not working perfectly because path of links on the different occurences of <pro>...</pro> may not be the same 
 # ex: see restoreboxparam.pro : domdef and saveboxparam
@@ -29 +33 @@
    for file_html in ${list_html_pro}
    do
+#      echo "file_html ${file_html}"
+#      read a
        fpath=$(dirname ${file_html} | sed -e "s+\(${output}/\)\(.*\)+\2+")
-       list_llink=$(grep -n "<pro>.*</pro>" ${file_html} | awk -F ":" '{print $1}')
-       for line in ${list_llink}
+       list_link=$(tr -s " " "\n" < ${file_html} | grep "<pro>.*</pro>"   | sed -e "s/^.*<pro>//" -e "s/<\/pro>.*$//")
+#      echo "liste link" ${list_link}
+#      read a
+       for link in ${list_link}
        do
           # replace <pro>something</pro> by
           #<a href="something.html">something</a>
-          # module is the html file name to be used
-          module=$(sed -ne "${line},${line}p" ${file_html} | \
-                   grep "<pro>.*</pro>" | \
-                   sed -e "s+\(.*<pro>\)\([^<]*\)\(</pro>.*\)+\\2.html+g")
-          modulemin=$(echo ${module} | tr "[:upper:]" "[:lower:]" )
+          # modulehtml is the html file name to be used
+          modulehtml=${link}.html
+          modulemin=$(echo ${modulehtml} | tr "[:upper:]" "[:lower:]" )
           # lpath is the path on module relatively to the location of
           # the html file containing the <pro>...</pro>
@@ -46 +52 @@
           then
              echo "eee : path of ${modulemin} not found under ${output}"
-             echo "eee : ${module} is used in ${file_html}"
+             echo "eee : ${link} is used in ${file_html}"
           else
              lpath=$(dirname ${lpath} | sed -e "s+\(${output}/\)\(.*\)+\2+")
@@ -67 +73 @@
              fi
 #echo "relpath ${relpath}"
-             sed -e "${line}s+\(<pro>\)\([^<]*\)\(</pro>\)+<a href=\"${relpath}/\\2.html\">\2</a>+g" \
+             cat <<EOF > /tmp/pro2href${$}.sed
+1{x;s@^@first@;x;}
+1,/<pro>${link}<\/pro>/{x;/first/s///;x;s@<pro>${link}<\/pro>@<a href="${relpath}/${link}.html">${link}<\/a>@;}
+EOF
+             sed -f /tmp/pro2href${$}.sed \
              ${file_html} > ${file_html}_modify
              mv ${file_html}_modify ${file_html}
+             rm /tmp/pro2href${$}.sed
           fi
        done

trunk/SRC/Interpolation/angle.pro

@@ -91 +91 @@
 ;       =>    gcosu[*, 0] = gcosu[*, 1]
 ;       =>    gsinu[*, 0] = gsinu[*, 1]
-;     (2) the grid follows OPA x and north pole periodicity rule (see <pro>lbcorca.pro</pro>)
+;     (2) the grid follows OPA x and north pole periodicity rule (see <pro>lbcorca</pro>)
 ;
 ; @history
@@ -97 +97 @@
 ;                   98-06 (G. Madec)
 ;       Feb 2005: IDL adaptation S. Masson
-;       May 2007: F points + call to <pro>lbcorca.pro</pro>
+;       May 2007: F points + call to <pro>lbcorca</pro>
 ;
 ; @version

trunk/SRC/Postscript/closeps.pro

@@ -10 +10 @@
 ;
 ; @keyword INFOWIDGET {type=long integer}
-; id of the information widget (created by <pro>OPENPS</pro>)
+; id of the information widget (created by <pro>openps</pro>)
 ; that we have to destroy at the end of closeps (when the postscript is done).
 ;

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltv.pro

@@ -55 +55 @@
 ;
 ; @keyword _EXTRA
-; Used to pass keywords to <pro>PLACEDESSIN</pro>, <pro>TV</pro>, <pro>AXE</pro>, <pro>LEGENDE</pro>, <pro>BARRECOULEUR</pro>, <pro>TERMINEDESSIN</pro>
+; Used to pass keywords to <pro>placedessin</pro>, <proidl>tv</proidl>,
+; <pro>axe</pro>, <pro>legende</pro>, <pro>barrecouleur</pro>, 
+; <pro>terminedessin</pro>
 ;
 ; @examples

trunk/SRC/ToBeReviewed/PLOTS/DIVERS/placedessin.pro

@@ -8 +8 @@
 ;
 ; @param TYPEDESSIN {type=string}
-; It specify what procedure is called by <pro>PLACEDESSIN</pro> : 
+; It specify what procedure is called by <pro>placedessin</pro> : 
 ; 'plt', 'pltz' or 'pltt'
 ;