Changeset 65 for trunk


Ignore:
Timestamp:
05/13/08 12:15:37 (16 years ago)
Author:
pinsard
Message:

some improvemnt but bibopa.sh and superbib01_txt.xsl are still not fully compatible

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/biblioentry_xml.xsl

    r64 r65  
    1313update : 
    1414$Id$ 
     15fplod 2008-05-13T09:17:14Z aedon.locean-ipsl.upmc.fr (Darwin) 
     16bibliomisc is written after biblioid 
    1517fplod 2008-05-07T09:06:53Z aedon.locean-ipsl.upmc.fr (Darwin) 
    1618improvements for conference 
    … …  
    8082       <xsl:apply-templates select="$my_biblioentry/descendant::d:pagenums"/> 
    8183      </xsl:if> 
     84      <xsl:apply-templates select="$my_biblioentry/d:biblioid"/> 
    8285      <xsl:if test="$my_biblioentry/descendant::d:biblioset/child::d:bibliomisc"> 
    8386       <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/child::d:bibliomisc"/> 
    … …  
    8588     </xsl:when> 
    8689     <xsl:when test="$my_biblioentry/descendant::d:biblioset[@relation='conference']"> 
     90      <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/child::d:title"/> 
     91      <xsl:text>, </xsl:text> 
    8792      <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/descendant::d:conftitle"/> 
    8893      <xsl:if test="$my_biblioentry/descendant::d:biblioset/descendant::d:confnum"> 
    … …  
    108113     </xsl:otherwise> 
    109114    </xsl:choose> 
    110     <xsl:apply-templates select="$my_biblioentry/d:biblioid"/> 
    111115  </xsl:element> 
    112116  <xsl:if test="$visu_modif= 'modif'"> 
    … …  
    148152   </xsl:message> 
    149153  </xsl:if> 
     154<!-- 
     155   <xsl:message> 
     156position de l'auteur <xsl:value-of select="d:personname/d:surname"/> : 
     157<xsl:value-of select="position()"/> / <xsl:value-of select="count(following-sibling::*)"/> 
     158</xsl:message> 
     159--> 
     160 
    150161  <xsl:choose> 
    151162   <xsl:when test="position()=1"> 
    … …  
    167178   </xsl:when> 
    168179   <xsl:when test="count(following-sibling::*)  = 1"> 
     180<!-- 
     181   <xsl:message>ANDDDDD</xsl:message> 
     182--> 
    169183    <!-- un suivant --> 
    170184    <xsl:call-template name="and"> 
    … …  
    189203  <xsl:value-of select="normalize-space(.)"/> 
    190204</xsl:template> 
     205 
    191206<xsl:template match="d:biblioentry/d:title"> 
    192207  <xsl:value-of select="normalize-space(.)"/> 
    … …  
    228243</xsl:template> 
    229244 
    230 <xsl:template match="d:biblioset[@relation='conference']/d:publisher/d:publishername"> 
    231   <xsl:value-of select="normalize-space(.)"/> 
    232 </xsl:template> 
     245<xsl:template match="d:biblioset[@relation='conference']/d:title"> 
     246<!-- title of proceedings for instance --> 
     247 <xsl:value-of select="normalize-space(.)"/> 
     248</xsl:template> 
     249 
    233250<xsl:template match="d:conftitle"> 
    234251  <xsl:value-of select="normalize-space(.)"/> 
    235252</xsl:template> 
     253 
    236254<xsl:template match="d:confdates"> 
    237255  <xsl:value-of select="normalize-space(.)"/> 
    … …  
    240258  <xsl:value-of select="normalize-space(.)"/> 
    241259</xsl:template> 
     260 
    242261<xsl:template match="d:address"> 
    243262  <xsl:value-of select="normalize-space(.)"/> 
    … …  
    309328eee : <xsl:value-of select="normalize-space(.)"/> 
    310329 </xsl:message> 
     330 <xsl:text>, </xsl:text> 
     331 <xsl:value-of select="normalize-space(.)"/> 
    311332</xsl:otherwise> 
    312333</xsl:choose> 

  • trunk/bibopa.sh

    r64 r65  
    265265jlist[${ij}]="Ocean Dyn." 
    266266ij=$(( ${ij} + 1)) 
    267 jlist[${ij}]="Geophysical Monograph Series" 
     267jlist[${ij}]="Geophysical Monograph Series, Earth's Climate: The Ocean-Atmosphere Interaction" 
    268268ij=$(( ${ij} + 1)) 
    269269jlist[${ij}]="Paleoceanography" 
    … …  
    476476      endline=${endline#*,} 
    477477      title=$( echo ${endline} | awk -F "," '{print $1}' | sed -e "s/\(title * = *{\)\(.*\)\(}\)/\2/") 
     478      #echo "title : ${title}" 
    478479      endline=${endline#*,} 
    479480#echo ${endline} | awk -F "," '{print $1}' #++debug 
    … …  
    581582# end of the line ; after the first : 
    582583  endline=${line#*:} 
    583  
    584584## find the journal 
    585585  j=1 
    … …  
    602602      # it might be a book, a manual, a conference, etc. ++ 
    603603      echo "  <title>${title}</title>" >> ${fileou} 
    604       #++echo "  <biblioid class=\"isbn\">${isbn}</biblioid>" >> ${fileou} 
    605604          cat <<EOF >> ${fileou} 
    606605  <biblioset relation="nojournal"> 
    … …  
    638637  else 
    639638      echo "non doi: ${line}" 
     639      echo "" 
    640640  fi 
    641641  num=$( echo ${endline} |  tr -dc "," | wc -c ) 
    642642  case ${num} in 
     643      0) 
     644### echo ${num}: ${endline} 
     645          cat <<EOF >> ${fileou} 
     646  <biblioset relation="journal"> 
     647    <title>${jfound}</title> 
     648    <pubdate>${year}</pubdate> 
     649    <bibliomisc>${endline}</bibliomisc> 
     650  </biblioset> 
     651EOF 
     652          unset jfound 
     653          unset year 
     654      ;; 
     655 
    643656      1) 
    644657### echo ${num}: ${endline} 
    … …  
    654667  </biblioset> 
    655668EOF 
     669          unset vol 
     670          unset pag 
     671          unset jfound 
     672          unset year 
    656673      ;; 
    657674      2) 
    … …  
    671688  </biblioset> 
    672689EOF 
     690          unset vol 
     691          unset pag 
     692          unset jfound 
     693          unset year 
     694          unset iss 
     695      ;; 
     696      6) 
     697          conftitle=${endline%%,*} 
     698          endline=${endline#*,} 
     699          confdates=${endline%%,*} # day(s) month 
     700          endline=${endline#*,} 
     701          confdates="${confdates}, ${endline%%,*}" # day(s) month and year 
     702          confdates=$( cleanname "${confdates}" ) 
     703          endline=${endline#*,} 
     704          confaddress=${endline%%,*} # Town 
     705          endline=${endline#*,} 
     706          confaddress="${confaddress}, ${endline%%,*}" # Town and country 
     707          confaddress=$( cleanname "${confaddress}" ) 
     708          endline=${endline#*,} 
     709          publishername=${endline%%,*} 
     710          publishername=$( cleanname "${publishername}" ) 
     711          endline=${endline#*,} 
     712          pag=${endline##*,} 
     713          pag=$( cleanname "${pag}" ) 
     714#set  
     715#read a 
     716          cat <<EOF >> ${fileou} 
     717<biblioset relation="conference"> 
     718 <title>${jfound}</title> 
     719 <pubdate>${year}</pubdate> 
     720 <publisher><publishername>${publishername}</publishername></publisher> 
     721 <pagenums>${pag}</pagenums> 
     722 <confgroup> 
     723  <conftitle>${conftitle}</conftitle> 
     724  <confdates>${confdates}</confdates> 
     725  <address>${confaddress}</address> 
     726 </confgroup> 
     727</biblioset> 
     728EOF 
     729      unset confaddress 
     730      unset conftitle 
     731      unset confdates 
     732      unset pag 
     733      unset publishername 
     734      unset year 
     735      unset jfound 
     736      ;; 
     737      10) 
     738          publishername=${endline%%Editors,*}  
     739          publishername="${publishername} Editors" 
     740          publishername=$( cleanname "${publishername}" ) 
     741          endline=${endline#*Editors,} 
     742          vol=${endline%%,*} 
     743          vol=$( cleanname "${vol}" ) 
     744          endline=${endline#*,} 
     745          pag=${endline%%,*} 
     746          pag=$( cleanname "${pag}" ) 
     747          endline=${endline#*,} 
     748          isbn=${endline%%,*} 
     749          isbn=$(echo ${isbn} | sed -e "s/ISBN ://") 
     750          isbn=$( cleanname "${isbn}" ) 
     751          endline=${endline#*,} 
     752          agu=${endline%%,*} 
     753          agu=$(echo ${agu} | sed -e "s/AGU ://") 
     754          agu=$( cleanname "${agu}" ) 
     755 
     756          endline=${endline#*${agu}} 
     757          endline=$( cleanname "${endline}" ) 
     758          endline=$( cleanname "${endline}" ) 
     759 
     760          cat <<EOF >> ${fileou} 
     761  <biblioid class="isbn">${isbn}</biblioid> 
     762  <biblioid class="other" otherclass="AGU">${agu}</biblioid> 
     763  <biblioset relation="journal"> 
     764    <title>${jfound}</title> 
     765    <pubdate>${year}</pubdate> 
     766    <publisher><publishername>${publishername}</publishername></publisher> 
     767    <volumenum>${vol}</volumenum> 
     768    <pagenums>${pag}</pagenums> 
     769    <bibliomisc>${endline}</bibliomisc> 
     770  </biblioset> 
     771EOF 
     772      unset isbn 
     773      unset agu  
     774      unset pag 
     775      unset publishername 
     776      unset year 
     777      unset jfound 
     778      unset vol 
     779 
    673780      ;; 
    674781      *) 
    675 #echo ${num}: ${endline} # ++debug 
     782echo ${num}: ${endline} # ++debug 
     783#set 
     784#exit 1 #++ debug 
    676785          cat <<EOF >> ${fileou} 
    677786  <biblioset relation="journal"> 
    … …  
    688797 
    689798EOF 
    690  
    691  
    692  
    693  
    694799  fi # end of if jfound not empty 
     800  unset title 
     801  unset vol 
     802  unset year  
     803  unset pag 
    695804  l=$(( ${l} + 1 )) 
    696805 

  • trunk/data/biball.xml

    r64 r65  
    7171<biblioentry xml:id="andrich1988_01"> 
    7272  <!-- date 
    73 2008-05-07T09:44:35Z 
     732008-05-13T09:30:41Z  
    7474  --> 
    7575  <!-- original text 
    … …  
    8484  <title>Performance evaluation for an Ocean General Circulation Model, Vectorization and Multitasking</title> 
    8585  <biblioset relation="conference"> 
     86    <title>In Conference Proceedings of the 1988 International Conference on Supercomputing</title> 
    8687    <pubdate>1988</pubdate> 
    8788    <publisher><publishername>AMC press</publishername></publisher> 
    … …  
    110111  <title>A multitasked general circulation model of the ocean</title> 
    111112  <biblioset relation="conference"> 
     113    <title>In Science and engineering on Cray Supercomputers, Proceedings of the 4th International Symposium Minneapolis</title> 
    112114    <pubdate>1988</pubdate> 
    113115    <publisher><publishername>Cray Research, Inc. book</publishername></publisher> 
    … …  
    20712073  <title>Modeling of oceans circulation</title> 
    20722074  <biblioset relation="journal"> 
    2073     <title>Energy Water Cycles in the Climate System.NATO Advanced Study Institute</title> 
     2075    <title>In Energy Water Cycles in the Climate System, NATO Advanced Study Institute</title> 
    20742076    <pubdate>1992</pubdate> 
    20752077    <publisher><publishername>E. Raschke D. Jacob</publishername><address> Luneburg, Germany</address></publisher> 
    … …  
    21282130  <title>Ocean modelling and the role of the ocean in the climate system</title> 
    21292131  <biblioset relation="journal"> 
    2130     <title>Modeling the Earth's Climate and its Variability</title> 
     2132    <title>In Modeling the Earth's Climate and its Variability</title> 
    21312133    <pubdate>1999</pubdate> 
    21322134    <publisher><publishername>W. R. Holland, S. Jaussaume and F. David, eds., Elsevier Science</publishername></publisher> 
    … …  
    35753577  <title>First considerations about modelling the ocean genral circulation on MIMD machines by domain decomposition method</title> 
    35763578  <biblioset relation="journal"> 
    3577     <title>High performance computing in the geosciences</title> 
     3579    <title>In High performance computing in the geosciences</title> 
    35783580    <publisher><publishername>Kluwer Academic Publish</publishername><address>Netherls</address></publisher> 
    35793581    <pagenums>125-140</pagenums> 
    … …  
    48744876  <title>Interannual variability simulated in the tropical Pacific</title> 
    48754877  <biblioset relation="journal"> 
    4876     <title>The mathematics of models for climatology and environment, NOTO ASI Series I: Global Environment Change</title> 
     4878    <title>In The mathematics of models for climatology and environment, NOTO ASI Series I: Global Environment Change</title> 
    48774879    <pubdate>1996</pubdate> 
    48784880    <publisher><publishername>Springer Verlag</publishername></publisher> 

  • trunk/makefile

    r64 r65  
    9696test_raw \ 
    9797test_raw_demo1 \ 
    98 test_raw_nemo \ 
     98test_raw_nemo1 \ 
     99test_raw_nemoall \ 
    99100dbkcheck \ 
    100101all \ 
    … …  
    126127        @echo "\$$ ln -sf $(DIRSRC)/data/biball.xml $(DIRTMP)/biblio.xml" 
    127128        @echo "" 
     129        @echo "for example for short NEMO Survey :" 
     130        @echo "\$$ ln -sf $(DIRSRC)/data/bibnemo1.xml $(DIRTMP)/biblio.xml" 
     131        @echo "" 
    128132        @echo "check for duplicate DOI; for example :" 
    129133        @echo "\$$ ./twindoi.sh -i $(DIRTMP)/biblio.xml -t xml" 
    … …  
    135139        @echo "\$$ ln -sf $(DIRSRC)/data/usernemo.dtd $(DIRTMP)/user.dtd" 
    136140        @echo "" 
    137         @echo "for example for NEMO Survey :" 
     141        @echo "for example for NEMO Survey (short and long):" 
    138142        @echo "\$$ ln -sf $(DIRSRC)/data/usernemo.xml $(DIRTMP)/user.xml" 
    139143        @echo "\$$ ln -sf $(DIRSRC)/data/usernemo.dtd $(DIRTMP)/user.dtd" 
    … …  
    175179        -@rm -f $(DIRTMP)/bibdemo1_dbk5.txt 
    176180        -@rm -f $(DIRTMP)/bibdemo1_dbk5.xml 
    177         -@rm -f $(DIRTMP)/bibnemo.xml 
    178         -@rm -f $(DIRTMP)/bibnemo.txt 
     181        -@rm -f $(DIRTMP)/bibnemo1.xml 
     182        -@rm -f $(DIRTMP)/bibnemo1.txt 
     183        -@rm -f $(DIRTMP)/bibnemoall.xml 
     184        -@rm -f $(DIRTMP)/bibnemoall.txt 
    179185        -@rm -f $(DIRTMP)/select_id.xml 
    180186        -@rm -f $(DIRTMP)/main_full.xml 
    … …  
    543549test_raw : \ 
    544550test_raw_demo1 \ 
    545 test_raw_nemo 
     551test_raw_nemo1 \ 
     552test_raw_nemoall 
    546553 
    547554test_raw_demo1 : \ 
    … …  
    549556$(DIRTMP)/bibdemo1_dbk5.xml \ 
    550557$(DIRTMP)/bibdemo1_dbk5.txt 
    551         diff $(DIRTMP)/bibdemo1_dbk5.xml $(DIRSRC)/data/bibdemo1_dbk5.xml | more 
     558        diff -b $(DIRTMP)/bibdemo1_dbk5.xml $(DIRSRC)/data/bibdemo1_dbk5.xml | more 
    552559        rm -i $(DIRTMP)/bibdemo1_dbk5.xml $(DIRTMP)/bibdemo1_dbk5.txt 
    553560 
    … …  
    555562$(DIRSRC)/data/bibdemo1_dbk5.xml \ 
    556563$(DIRSRC)/superbib01_txt.xsl 
    557         @xsltproc --param makedate "'$(MAKEDATE)'" \ 
     564        xsltproc --param makedate "'$(MAKEDATE)'" \ 
    558565        --output $@ \ 
    559566        $(DIRSRC)/superbib01_txt.xsl \ 
    … …  
    563570$(DIRTMP)/bibdemo1_dbk5.txt \ 
    564571$(DIRSRC)/bibopa.sh 
    565         @$(DIRSRC)/bibopa.sh -p demo1 -i $(DIRTMP)/bibdemo1_dbk5.txt -t raw -l fr 
    566  
    567 test_raw_nemo : \ 
     572        $(DIRSRC)/bibopa.sh -p demo1 -i $(DIRTMP)/bibdemo1_dbk5.txt -t raw -l fr 
     573 
     574test_raw_nemo1 : \ 
     575$(DIRSRC)/data/bibnemo1.xml \ 
     576$(DIRTMP)/bibnemo1.xml \ 
     577$(DIRTMP)/bibnemo1.txt 
     578        diff -b $(DIRTMP)/bibnemo1.xml $(DIRSRC)/data/bibnemo1.xml | more 
     579        rm -i $(DIRTMP)/bibnemo1.xml $(DIRTMP)/bibnemo1.txt 
     580 
     581$(DIRTMP)/bibnemo1.txt : \ 
     582$(DIRSRC)/data/bibnemo1.xml \ 
     583$(DIRSRC)/superbib01_txt.xsl 
     584        xsltproc --param makedate "'$(MAKEDATE)'" \ 
     585        --output $@ \ 
     586        $(DIRSRC)/superbib01_txt.xsl \ 
     587        $(DIRSRC)/data/bibnemo1.xml 
     588 
     589$(DIRTMP)/bibnemo1.xml : \ 
     590$(DIRTMP)/bibnemo1.txt \ 
     591$(DIRSRC)/bibopa.sh 
     592        $(DIRSRC)/bibopa.sh -p nemo -i $(DIRTMP)/bibnemo1.txt -t raw -l en 
     593 
     594test_raw_nemoall : \ 
    568595$(DIRSRC)/data/biball.xml \ 
    569 $(DIRTMP)/bibnemo.xml \ 
    570 $(DIRTMP)/bibnemo.txt 
    571         diff $(DIRTMP)/bibnemo.xml $(DIRSRC)/data/biball.xml | more 
    572         rm -i $(DIRTMP)/bibnemo.xml $(DIRTMP)/bibnemo.txt 
    573  
    574 $(DIRTMP)/bibnemo.txt : \ 
     596$(DIRTMP)/bibnemoall.xml \ 
     597$(DIRTMP)/bibnemoall.txt 
     598        diff -b $(DIRTMP)/bibnemoall.xml $(DIRSRC)/data/biball.xml | more 
     599        rm -i $(DIRTMP)/bibnemoall.xml $(DIRTMP)/bibnemoall.txt 
     600 
     601$(DIRTMP)/bibnemoall.txt : \ 
    575602$(DIRSRC)/data/biball.xml \ 
    576603$(DIRSRC)/superbib01_txt.xsl 
    577         @xsltproc --param makedate "'$(MAKEDATE)'" \ 
     604        xsltproc --param makedate "'$(MAKEDATE)'" \ 
    578605        --output $@ \ 
    579606        $(DIRSRC)/superbib01_txt.xsl \ 
    580607        $(DIRSRC)/data/biball.xml 
    581608 
    582 $(DIRTMP)/bibnemo.xml : \ 
    583 $(DIRTMP)/bibnemo.txt \ 
     609$(DIRTMP)/bibnemoall.xml : \ 
     610$(DIRTMP)/bibnemoall.txt \ 
    584611$(DIRSRC)/bibopa.sh 
    585         @$(DIRSRC)/bibopa.sh -p nemo -i $(DIRTMP)/bibnemo.txt -t raw -l en 
     612        $(DIRSRC)/bibopa.sh -p nemo -i $(DIRTMP)/bibnemoall.txt -t raw -l en 
Note: See TracChangeset for help on using the changeset viewer.