Changeset 22

Timestamp:

09/21/07 14:53:17 (17 years ago)

Author:

pinsard

Message:

bug fix

File:

• trunk/bibopa.sh (modified) (16 diffs)

trunk/bibopa.sh

@@ -5 +5 @@
 #    Dipole on the East African Short Rains: A CGCM Study, J. Climate, In
 #    press.
-#    
+#
 #    donnerait
-#    
+#
 #    <biblioentry id="behara2004">
 #    <authorgroup>
@@ -25 +25 @@
 #    <biblioid class="doi">doi</bibliomisc>
 #    <bibliomisc role="pseudoref">In press.</bibliomisc>
-#    <bibliomisc role="internalref">from 
+#    <bibliomisc role="internalref">from
 #    http://www.lodyc.jussieu.fr/~opatlod/NEMO_v1/6_Menu/2_page/index.html
 #    2007-03-29T16:24:31Z fplod by hand</bibliomisc>
 #    </biblioentry>
-#    
+#
 #
 # example :
@@ -41 +41 @@
 #
 # update
-# ++ gestion des comments 
+# ++ gestion des comments
 # ++ gestion des id existants (cf à la fin)
 # ++ option debug
@@ -54 +54 @@
 # comments  (line begininig with #) are now possible
 # Sebastien Masson avril 2007 creation
-# 
+#
 
 rmbl () {
-    echo "$1" | sed -e "s/^ *//" | sed -e "s/ *$//"
+    echo "${1}" | sed -e "s/^ *//" | sed -e "s/ *$//"
 }
 cleanname () {
-    echo "$1" | sed -e "s/^ *//" \
+    echo "${1}" | sed -e "s/^ *//" \
         -e "s/^ *,//" \
         -e "s/^ *;//" \
@@ -86 +86 @@
 usage=" Usage : ${command} -i filein -t type"
 #
-while [ ! -z "${1}" ] # ++ pb bash
+minargcount=4
+echo " narg ${#}"
+if [ ${#} -lt ${minargcount} ]
+then
+  echo "eee : not enought arguments"
+  echo "${usage}"
+  exit 1
+fi
+#
+while [ ! -z "${1}" ]
 do
  case ${1} in
- -i) # filein 
+ -i) # filein
   filein=${2}
   shift
  ;;
- -t) # type 
+ -t) # type
   type=${2}
   shift
+ ;;
+ -h)
+  echo "${usage}"
+  exit 0
  ;;
  *) # other choice
@@ -104 +117 @@
  shift # next flag
 done
-# 
+#
 set -u
 #
-# check for filein 
+# check for filein
 if [ ! -f ${filein} ]
 then
@@ -130 +143 @@
  #read a #++ if debug
 ;;
-*) 
+*)
    echo "eee : type should be raw or mailbody"
    exit 1
@@ -242 +255 @@
 do
 # extract one line
-
   line=$( sed -n ${l}p ${fileraw_strict} )
   orgline=$( echo ${line} | sed -e "s/--/- -/g" )
@@ -267 +279 @@
   num=$( grep -c "<biblioentry id=\"${refid}_[0-9][0-9]\">" ${fileou} )
   num=$(( ${num} + 1 ))
-  [ ${num} -le 9 ] && num=0${num} 
+  [ ${num} -le 9 ] && num=0${num}
   refid=${refid}_${num}
-  
+
           cat <<EOF >> ${fileou}
 <biblioentry id="${refid}">
@@ -276 +288 @@
   -->
   <!-- original text
-  $orgline
+  ${orgline}
   -->
   <authorgroup>
     <author> <personname> <surname>${firstsn}</surname> <firstname>${firstfn}</firstname> </personname> </author>
 EOF
-  
+
 ## other authors..
   previous=${first},
@@ -299 +311 @@
 #
     echo "    <author> <personname> <surname>${nextsn}</surname> <firstname>${nextfn}</firstname> </personname> </author>" >> ${fileou}
+    echo "    <author> <personname> <surname>${nextsn}</surname> <firstname>${nextfn}</firstname> </personname> </author>"  #++debug
     previous=${next},
     next=${auths##*${previous}}
-    
+
   done
   echo "  </authorgroup>"  >> ${fileou}
-  
+
 # end of the line ; after the first :
   endline=${line#*:}
-  
+
 ## find the journal
   j=1
   jfound=""
   jlistsize=${#jlist[@]}
-  while [[ $j -le $jlistsize && "${jfound}" == "" ]]
+  while [[ ${j} -le ${jlistsize} && "${jfound}" == "" ]]
     do
-    ok=$( echo ${endline} | grep -ci "${jlist[j]} *," ) 
+    ok=$( echo ${endline} | grep -ci "${jlist[j]} *," )
     [ $ok -eq 1 ] && jfound="${jlist[j]}"
-    j=$(( $j + 1 ))
+    j=$(( ${j} + 1 ))
   done
-  if [ "$jfound" == "" ]
+  if [ "${jfound}" == "" ]
       then
-      echo "ERROR Journal not found"
+      echo "eee: Journal not found "
       echo "${endline}"
       exit
   fi
-## title 
+## title
 # before the first :
   title=${endline%%${jfound}*}
   title=$( cleanname "${title}" )
   echo "  <title>${title}</title>" >> ${fileou}
-## end 
+## end
 ## end of the line ; after the first ${jfound}
   endline=${endline#*${jfound}}
@@ -336 +349 @@
   endline=$( echo ${endline} | sed -e "s/[dD][oO][iI] *\t* *: *\t* */doi:/" )
   ok=$( echo ${endline} | grep -ic "doi:" )
-  if [ $ok -eq 1 ]
+  if [ ${ok} -eq 1 ]
       then
       doi=${endline##*doi:}
@@ -347 +360 @@
   num=$( echo ${endline} |  tr -dc "," | wc -c )
   case ${num} in
-      1) 
+      1)
 ### echo ${num}: ${endline}
           vol=${endline%,*}
           vol=$( cleanname "${vol}" )
-          pag=${endline##*,} 
+          pag=${endline##*,}
           pag=$( cleanname "${pag}" )
           cat <<EOF >> ${fileou}
@@ -361 +374 @@
 EOF
       ;;
-      2) 
+      2)
           vol=${endline%,*}
           vol=$( cleanname "${vol}" )
-          iss=${vol##*,} 
+          iss=${vol##*,}
           iss=$( cleanname "${iss}" )
           vol=${vol%,*}
           vol=$( cleanname "${vol}" )
-          pag=${endline##*,} 
+          pag=${endline##*,}
           pag=$( cleanname "${pag}" )
           cat <<EOF >> ${fileou}
@@ -389 +402 @@
       ;;
   esac
- 
+
           cat <<EOF >> ${fileou}
 </biblioentry>
-  
-EOF
-
-
-
-
-  
-  l=$(( $l + 1 ))
-  
+
+EOF
+
+
+
+
+
+  l=$(( ${l} + 1 ))
+
 done
 echo "</bibliography>" >> ${fileou}
@@ -413 +426 @@
 # clean
 echo "iii : xml.err contains stderr from the following command "
-echo "iii : which was done just to check consistence of ${fileou}" 
+echo "iii : which was done just to check consistence of ${fileou}"
 echo "iii : xmlto pdf ${fileou}"
 rm -i xml.err
 case ${type} in
-raw) 
+raw)
  echo "iii : ${fileraw_strict} contains a copy of input file without comments"
  rm -i ${fileraw_strict}