Changeset 3177

Show
Ignore:
Timestamp:
24.06.2002 21:24:11 (17 years ago)
Author:
sjboddie
Message:

*** empty log message ***

Location:
trunk/protemix
Files:
27 added
9 modified

Legend:

Unmodified
Added
Removed
  • trunk/protemix/etc/collect.cfg

    r3168 r3177  
    1616 
    1717classify      AZList -metadata Title 
     18classify      phind 
     19 
     20format DocumentHeading "<b>[parent:Title]</b>" 
    1821 
    1922format CL1VList \ 
    20   '<p>[Title]<br><small>\[ [link]HTML</a> \]\[ <a href="_httpcollection_/index/assoc/[archivedir]/[pdf]">PDF</a> \]</small></p>' 
     23  '<p>[Title]<br><small>\[ [link]text</a> \]\[ <a href="_httpcollection_/index/assoc/[archivedir]/[pdf]">pdf</a> \]</small></p>' 
    2124 
    2225format SearchVList \ 
    23   '<p>[parent:Title] <small><i>(page [Title])</i><br>\[ [link]HTML</a> \]\[ <a href="_httpcollection_/index/assoc/[parent:archivedir]/[pdf]">Single Page PDF</a> \]\[ <a href="_httpcollection_/index/assoc/[parent:archivedir]/[parent:pdf]">Article PDF</a> \]</small></p>' 
     26  '<p>{If}{[parent:Title],[parent:Title] <small><i>(page [Title])</i>,[Title]}<br>\[ [link]text</a> \]\[ <a href="_httpcollection_/index/assoc/[parent:archivedir]/[pdf]">page</a> \]\[ <a href="_httpcollection_/index/assoc/[parent:archivedir]/[parent:pdf]">article</a> \]</small></p>' 
    2427 
    2528collectionmeta collectionname      "Protemix FDA Submission" 
     
    2730 
    2831cgiarg          shortname=a argdefault=q 
     32cgiarg          shortname=t argdefault=0 
  • trunk/protemix/macros/base.dm

    r3168 r3177  
    3434_imagecollection_ {<img src="_httpcollection_/images/protemixlogo.gif">} 
    3535 
    36 ####################################################################### 
    37 # these width macros are read in by the server when calculating  
    38 # width of navigation bar etc. There should be one for each  
    39 # classification that this receptionist supports, one for the  
    40 # search button, and the _pagewidth_ macro which is the total width 
    41 # of the page 
    42 ####################################################################### 
    43  
    4436# width of tabs when displaying tables of contents 
    4537_tabwidth_ {25} 
    46  
    47 _pagewidth_ {537} 
    48 # defaultwidth is the width buttons default to if not included in this list 
    49 _defaultwidth_ {87} 
    50 _searchwidth_ {_widthtsrchx_} 
    51 _Titlewidth_ {_widthttitlx_} 
    5238 
    5339####################################################################### 
     
    115101 
    116102####################################################################### 
    117 # navigation bar images 
    118 # 
    119 ####################################################################### 
    120  
    121 # the spacer image - the width of this is set from server 
    122 _imagespacer_ {<img  
    123 src="_httpicontspace_" width="_widthtspace_" height="_heighttspace_">} 
    124  
    125 # image macros for all the classifications currently supported by 
    126 # this receptionist. 
    127  
    128 _imagesearch_ {_If_("_cgiargu_" ne "1",_imagesearch2_,_iconnosearch_)} 
    129 _imagesearch2_ {_gsimage_(_httpquery_,_httpicontsrchof_,_httpicontsrchon_,srch,_textimagesearch_)} 
    130 _imageTitle_ {_gsimage_(_httpbrowseTitle_,_httpiconttitlof_,_httpiconttitlon_,titles,_textimageTitle_)} 
    131  
    132 ####################################################################### 
    133103# java images/scripts 
    134104####################################################################### 
     
    175145_httpbuild_ {_gwcgi_?e=_compressedoptions_&a=bc} 
    176146 
    177 _httpiconchalk_ {_httpimg_/chalk.gif} 
     147_httpiconchalk_ {_httpcollection_/images/bottombgnd.gif} 
    178148_widthchalk_ {2000} 
    179149_heightchalk_ {10} 
     
    281251####################################################################### 
    282252 
    283 _iconnext_{<img src="_httpiconmore_" align=absbottom  
    284 width=_widthmore_ height=_heightmore_ border=0 alt="_texticonnext_">} 
    285  
    286 _iconprev_{<img src="_httpiconless_" align=absbottom  
    287 width=_widthless_ height=_heightless_ border=0 alt="_texticonprev_">} 
     253_iconnext_{&nbsp;&gt;} 
     254 
     255_iconprev_{&lt;&nbsp;} 
    288256 
    289257_icontabsearchgreen_ {<img  
     
    293261src="_httpiconttitlgr_" width=_widthttitlx_ border=0>} 
    294262 
    295 _iconblankbar_ {<center><img src="_httpicondivb_" width=_widthdivb_ height=_heightdivb_></center>} 
     263_iconblankbar_ {<center><img src="_httpcollection_/images/bar.gif"></center>} 
    296264 
    297265_icontext_ {<img border=0 align=absmiddle src="_httpiconitext_" width=_widthitext_ height=_heightitext_ alt="_texticontext_">} 
  • trunk/protemix/macros/document.dm

    r3169 r3177  
    1616 
    1717_content_ { 
     18<p> 
    1819<center> 
    19 _navigationbar_ 
    20 <p> 
    2120_phindclassifier_ 
    2221</center> 
     22</p> 
    2323} 
    2424 
     
    4747 
    4848_navarrows_ {<center> 
    49 <table width=_pagewidth_ cellpadding=0 cellspacing=0 border=0> 
     49<table width="638" cellpadding=0 cellspacing=0 border=0> 
    5050<tr><td align=left valign=top> 
    5151_prevarrow_ 
     
    5656} 
    5757 
    58 _prevarrow_ {_If_(_httpprevarrow_,<a href="_httpprevarrow_">_iconprev_</a>)} 
    59 _nextarrow_ {_If_(_httpnextarrow_,<a href="_httpnextarrow_">_iconnext_</a>)} 
     58_prevarrow_ {_If_(_httpprevarrow_,<a href="_httpprevarrow_">&lt;</a>)} 
     59_nextarrow_ {_If_(_httpnextarrow_,<a href="_httpnextarrow_">&gt;</a>)} 
    6060 
    6161_navarrows_ [v=1] {<p> 
     
    102102  <PARAM NAME=resultorder VALUE="L,l,E,e,D,d"> 
    103103 
    104   <PARAM NAME=backdrop     VALUE="_httpimg_/phindbg1.jpg"> 
     104  <PARAM NAME=backdrop     VALUE="_httpcollection_/images/phind3.jpg"> 
    105105  <PARAM NAME=fontsize     VALUE="10"> 
    106106  <PARAM NAME=blocksize    VALUE="10"> 
     
    249249 
    250250# can't use _gsimage_ macro for detach button as we need to include target 
    251 _imagedetach_ {<a href="_httpcurrentdocument_&x=1" target=\_blank onMouseover="roll('detach',1);" onMouseOut="roll('detach',0);"><img 
    252 name="detach" src="_httpiconedtchof_" onLoad="gbutton(this,'_httpiconedtchon_');" border=0 alt="_texticondetach_"></a>} 
    253 _imagedetach_ [v=1] {<a href="_httpcurrentdocument_&x=1" target=\_blank>_texticondetach_</a><br>} 
    254  
    255 _imagehighlight_ {_gsimage_(_httpcurrentdocument_&hl=1&gc=_cgiarggc_&amp;gt=_cgiarggt_,_document:httpiconehlof_,_document:httpiconehlon_,hl,_document:texticonhighlight_)} 
    256  
    257 _imagenohighlight_ {_gsimage_(_httpcurrentdocument_&hl=0&gc=_cgiarggc_&amp;gt=_cgiarggt_,_document:httpiconenhlof_,_document:httpiconenhlon_,nhl,_document:texticonnohighlight_)} 
    258  
    259 _imagepagepdf_ {_gsimage_(_httpcollection_/index/assoc/_thisOID_/_pagepdf_,_document:httpiconsppdfof_,_document:httpiconsppdfon_,pagepdf,_document:texticonpagepdf_)} 
    260  
    261 _imagearticlepdf_ {_gsimage_(_httpcollection_/index/assoc/_thisOID_/article.pdf,_document:httpiconapdfof_,_document:httpiconapdfon_,artpdf,_document:texticonartpdf_)} 
    262  
    263 _imagecontracttoc_ {_gsimage_(_httpcurrentdocument_&gc=0,_document:httpiconeconcof_,_document:httpiconeconcon_,concon,_document:texticoncontracttoc_)} 
    264  
    265 _imageexpandtoc_ {_gsimage_(_httpcurrentdocument_&gc=1,_document:httpiconeexpcof_,_document:httpiconeexpcon_,expcon,_document:texticonexpandtoc_)} 
    266  
    267 _imagecontracttext_ {_gsimage_(_httpcurrentdocument_&amp;gt=0,_document:httpiconetsecof_,_document:httpiconetsecon_,thissec,_document:texticoncontracttext_)} 
    268  
    269 _imageexpandtext_ {_gsimage_(_httpcurrentdocument_&amp;gt=1,_document:httpiconealltof_,_document:httpiconeallton_,alltext,_document:texticonexpandtext_)} 
    270  
    271 _imagecont_ {_gsimage_(_httpcurrentdocument_&amp;gt=2,_document:httpiconcontoff_,_document:httpiconconton_,cont,_document:texticoncont_)} 
    272  
    273  
    274 ####################################################################### 
    275 # headers/footers 
    276 ####################################################################### 
    277  
    278  
    279 # header overridden for text pages 
    280 # the tabspace is there because netscape refuses to let our flashy button 
    281 # javacript stuff work on a button that is the first image in the page 
    282 _textheader_ {_cgihead_ 
    283 _htmlhead_ 
    284 <center> 
    285 <table width=_pagewidth_><tr><td align=right> 
    286 _icontab__javalinks_</td></tr></table> 
    287 </center> 
    288 } 
    289 _textheader_ [v=1] {_cgihead_ 
    290 _htmlhead_ 
    291 _javalinks_ 
    292 } 
    293  
    294 _footer_ { 
    295 <p> 
    296 _navarrows_ 
    297 </table> 
    298 _endspacer__htmlfooter_ 
    299 } 
     251_imagedetach_ {<a href="_httpcurrentdocument_&x=1" target=\_blank 
     252onMouseOut="MM_nbGroup('out');" 
     253onMouseOver="MM_nbGroup('over','detach','_httpcollection_/images/detachon.gif','_httpcollection_/images/detachon.gif',1);" 
     254onClick="MM_nbGroup('down','navbar1','detach','_httpcollection_/images/detachon.gif',1);"><img 
     255name="detach" src="_httpcollection_/images/detachoff.gif" width="52" height="11" border="0" alt="open this page in a new window"></a>} 
     256 
     257_imagehighlight_ {<a href="_httpcurrentdocument_&hl=1&gc=_cgiarggc_&amp;gt=_cgiarggt_" 
     258onMouseOut="MM_nbGroup('out');" 
     259onMouseOver="MM_nbGroup('over','hl','_httpcollection_/images/highlighton.gif','_httpcollection_/images/highlighton.gif',1);" 
     260onClick="MM_nbGroup('down','navbar1','hl','_httpcollection_/images/highlighton.gif',1);"><img 
     261name="hl" src="_httpcollection_/images/highlightoff.gif" width="92" height="11" border="0" alt="turn on search term highlighting"></a>} 
     262 
     263_imagenohighlight_ {<a href="_httpcurrentdocument_&hl=0&gc=_cgiarggc_&amp;gt=_cgiarggt_" 
     264onMouseOut="MM_nbGroup('out');" 
     265onMouseOver="MM_nbGroup('over','nhl','_httpcollection_/images/nohighlighton.gif','_httpcollection_/images/nohighlighton.gif',1);" 
     266onClick="MM_nbGroup('down','navbar1','nhl','_httpcollection_/images/nohighlighton.gif',1);"><img 
     267name="nhl" src="_httpcollection_/images/nohighlightoff.gif" width="92" height="11" border="0" alt="turn off search term highlighting"></a>} 
     268 
     269_imagepagepdf_ {<a href="_httpcollection_/index/assoc/_thisOID_/_pagepdf_" 
     270onMouseOut="MM_nbGroup('out');" 
     271onMouseOver="MM_nbGroup('over','ppdf','_httpcollection_/images/pagepdfon.gif','_httpcollection_/images/pagepdfon.gif',1);" 
     272onClick="MM_nbGroup('down','navbar1','ppdf','_httpcollection_/images/pagepdfon.gif',1);"><img 
     273name="ppdf" src="_httpcollection_/images/pagepdfoff.gif" width="52" height="11" border="0" alt="view pdf file of this page"></a>} 
     274 
     275_imagearticlepdf_ {<a href="_httpcollection_/index/assoc/_thisOID_/article.pdf" 
     276onMouseOut="MM_nbGroup('out');" 
     277onMouseOver="MM_nbGroup('over','apdf','_httpcollection_/images/articlepdfon.gif','_httpcollection_/images/articlepdfon.gif',1);" 
     278onClick="MM_nbGroup('down','navbar1','apdf','_httpcollection_/images/articlepdfon.gif',1);"><img 
     279name="apdf" src="_httpcollection_/images/articlepdfoff.gif" width="52" height="11" border="0" alt="view pdf file of entire article"></a>} 
  • trunk/protemix/macros/english.dm

    r3168 r3177  
    155155 
    156156## "DETACH" ## document_button ## edtch ## 
    157 _httpiconedtchof_ {_httpimg_/edtchof.gif} 
    158 _httpiconedtchon_ {_httpimg_/edtchon.gif} 
     157_httpiconedtchof_ {_httpcollection_/images/detachoff.gif} 
     158_httpiconedtchon_ {_httpcollection_/images/detachon.gif} 
    159159 
    160160## "EXPAND CONTENTS" ## document_button ## eexpc ## 
  • trunk/protemix/macros/query.dm

    r3168 r3177  
    8383} 
    8484 
    85 _header_ {_cgihead_ 
    86 _htmlhead_(background="_httpiconchalk_" onLoad="initialize();")_startspacer__pagebanner_ 
    87 } 
    88  
    89 _pagetitle_ {} 
    90  
    9185_content_ { 
    92 <center> 
    93 _navigationbar_ 
    94 </center> 
    9586<center> 
    9687_queryform_ 
     
    10798<input type=hidden name="e" value="_decodedcompressedoptions_"> 
    10899<p> 
    109 <table border="0" cellspacing="0" cellpadding="0" width="_pagewidth_"> 
     100<table border="0"> 
    110101 
    111 <tr valign="top"> 
    112 <td align="center"> 
    113 <select name="c1"> 
    114 <option value=""_If_(_cgiargc1_,, selected)>Any 
    115 <option value="Animal"_If_("_cgiargc1_" eq "Animal", selected)>Animal 
    116 <option value="Human"_If_("_cgiargc1_" eq "Human", selected)>Human 
    117 <option value="Other"_If_("_cgiargc1_" eq "Other", selected)>Other 
     102<tr valign="center"> 
     103<td align="right"><b>Type</b></td> 
     104<td><select name="c1"> 
     105<option value="" _If_(_cgiargc1_,, selected)>Any 
     106<option value="Animal" _If_("_cgiargc1_" eq "Animal", selected)>Animal 
     107<option value="Human" _If_("_cgiargc1_" eq "Human", selected)>Human 
     108<option value="Other" _If_("_cgiargc1_" eq "Other", selected)>Other 
    118109</select> 
    119110</td> 
     111</tr> 
    120112 
    121 <td align="center"> 
    122 <b>AND</b> 
    123 </td> 
    124  
    125 <td align="center"> 
     113<tr valign="center"> 
     114<td align="right"><b>Category</b></td> 
     115<td> 
    126116<select name="c2" onChange='initialize()'> 
    127 <option value=""_If_(_cgiargc2_,, selected)>Any 
    128 <option value="Pharmacokinetics"_If_("_cgiargc2_" eq "Pharmacokinetics", selected)>Pharmacokinetics 
    129 <option value="Pharmacodynamics"_If_("_cgiargc2_" eq "Pharmacodynamics", selected)>Pharmacodynamics 
    130 <option value="Safety/Side Effects/Toxicity"_If_("_cgiargc2_" eq "Safety/Side Effects/Toxicity", selected)>Safety/Side Effects/Toxicity 
    131 <option value="Other"_If_("_cgiargc2_" eq "Other", selected)>Other 
    132 <option value="Efficacy"_If_("_cgiargc2_" eq "Efficacy", selected)>Efficacy 
    133 <option value="Contraindications"_If_("_cgiargc2_" eq "Contraindications", selected)>Contraindications 
    134 <option value="Precautions"_If_("_cgiargc2_" eq "Precautions", selected)>Precautions 
     117<option value="" _If_(_cgiargc2_,, selected)>Any 
     118<option value="Pharmacokinetics" _If_("_cgiargc2_" eq "Pharmacokinetics", selected)>Pharmacokinetics 
     119<option value="Pharmacodynamics" _If_("_cgiargc2_" eq "Pharmacodynamics", selected)>Pharmacodynamics 
     120<option value="Safety/Side Effects/Toxicity" _If_("_cgiargc2_" eq "Safety/Side Effects/Toxicity", selected)>Safety/Side Effects/Toxicity 
     121<option value="Other" _If_("_cgiargc2_" eq "Other", selected)>Other 
     122<option value="Efficacy" _If_("_cgiargc2_" eq "Efficacy", selected)>Efficacy 
     123<option value="Contraindications" _If_("_cgiargc2_" eq "Contraindications", selected)>Contraindications 
     124<option value="Precautions" _If_("_cgiargc2_" eq "Precautions", selected)>Precautions 
    135125</select> 
    136126</td> 
     127</tr> 
    137128 
    138 <td align="center"> 
    139 <b>AND</b> 
    140 </td> 
    141  
    142 <td align="center"> 
     129<tr valign="center"> 
     130<td align="right"><b>Sub-Category</b></td> 
     131<td> 
    143132<select name="c3"> 
    144133<option value="">Any 
    145134</select> 
    146135</td> 
    147  
    148136</tr> 
    149137 
    150 <tr valign="top"><td colspan="5"> 
    151 <b>AND</b><br> 
     138<tr valign="center"> 
     139<td align="right"><b>Search Terms</b></td> 
     140<td> 
    152141<nobr> 
    153142<input type="text" name="q" value="_cgiargq_" size="40"> 
     
    164153_pagefooterextra_ { 
    165154<center> 
    166 <table cellspacing=0 cellpadding=0 width=_pagewidth_> 
     155<table cellspacing=0 cellpadding=0 width="638"> 
    167156<tr> 
    168 <td align=left>_If_(_prevfirst_,<a href="_httpquery_&r=_prevfirst_">_iconprev__textmatches__prevfirst_ - _prevlast_</a>)</td> 
    169 <td align=right>_If_(_nextfirst_,<a href="_httpquery_&r=_nextfirst_">_textmatches__nextfirst_ - _nextlast__iconnext_</a>)</td> 
     157<td align=left>_If_(_prevfirst_,<a href="_httpquery_&r=_prevfirst_">&lt; _textmatches__prevfirst_ - _prevlast_</a>)</td> 
     158<td align=right>_If_(_nextfirst_,<a href="_httpquery_&r=_nextfirst_">_textmatches__nextfirst_ - _nextlast_ &gt;</a>)</td> 
    170159</tr></table> 
    171160</center> 
  • trunk/protemix/perllib/plugins/ProtemixPlug.pm

    r3168 r3177  
    120120 
    121121        # add any section level metadata we have for this page (set from within the meta.xml file) 
    122         if (defined ($self->{'section_metadata'}->{$filesuf})) { 
    123         foreach my $key (keys %{$self->{'section_metadata'}->{$filesuf}}) { 
    124             $doc_obj->add_utf8_metadata ($cursection, $key, $self->{'section_metadata'}->{$filesuf}->{$key}); 
    125         } 
    126         } 
     122 
     123# currently commented out as we're not using Class1, Class2, and Class3 metadata yet 
     124#       if (defined ($self->{'section_metadata'}->{$filesuf})) { 
     125#       foreach my $key (keys %{$self->{'section_metadata'}->{$filesuf}}) { 
     126#           $doc_obj->add_utf8_metadata ($cursection, $key, $self->{'section_metadata'}->{$filesuf}->{$key}); 
     127#       } 
     128#       } 
    127129 
    128130        $count ++; 
  • trunk/protemix/src/recpt/browsetools.cpp

    r3168 r3177  
    731731    textout << "<center>\n"; 
    732732    textout << outconvert << disp  
    733         << "<p><table width=\"_pagewidth_\" cellpadding=\"0\" cellspacing=\"0\">\n" 
     733        << "<p><table width=\"638\" cellpadding=\"0\" cellspacing=\"0\">\n" 
    734734        << "<tr valign=\"top\">\n" 
    735735        << "<td>\n"; 
  • trunk/protemix/src/recpt/ptmxdocaction.cpp

    r3168 r3177  
    3939  documentaction::define_internal_macros(disp, args, protos, logout); 
    4040 
     41  // don't want header overridden for protemix collection 
     42  disp.setmacro ("header", "document", "_Global:header_"); 
     43 
    4144  // set _pagepdf_ metadata 
    4245 
  • trunk/protemix/src/recpt/ptmxqueryaction.cpp

    r3167 r3177  
    110110 
    111111  if (!args["c1"].empty() && args["c1"] != "Any") { 
    112     formattedstring = "[" + args["c1"] + "]:CL"; 
     112    //    formattedstring = "[" + args["c1"] + "]:CL"; 
     113    formattedstring = args["c1"]; 
    113114  } 
    114115  if (!args["c2"].empty() && args["c2"] != "Any") { 
    115116    if (!formattedstring.empty()) formattedstring += " & "; 
    116     formattedstring += "[" + args["c2"] + "]:CA"; 
     117    //    formattedstring += "[" + args["c2"] + "]:CA"; 
     118    formattedstring += args["c2"]; 
    117119  } 
    118120  if (!args["c3"].empty() && args["c3"] != "Any") { 
    119121    if (!formattedstring.empty()) formattedstring += " & "; 
    120     formattedstring += "[" + args["c3"] + "]:CS"; 
     122    //    formattedstring += "[" + args["c3"] + "]:CS"; 
     123    formattedstring += args["c3"]; 
    121124  } 
    122125  if (!args["q"].empty()) {