Changeset 1129
- Timestamp:
- 2000-04-20T10:30:25+12:00 (24 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/bin/script/gsw3mir.pl
r845 r1129 1 #!/usr/ local/bin/perl5-w1 #!/usr/bin/perl -w 2 2 3 3 ########################################################################### -
trunk/gsdl/bin/script/mkcol.pl
r1031 r1129 51 51 print STDERR " -title text The title for the collection\n"; 52 52 print STDERR " -about text The about text for the collection\n"; 53 print STDERR " -plugins list Space separated list of perl plugin modules to use\n"; 53 print STDERR " -plugin text perl plugin module to use (there may be multiple\n"; 54 print STDERR " plugin entries\n"; 54 55 print STDERR " -refine list Space separated list of perl plugin modules to use\n"; 55 56 … … 106 107 $line =~ s/\*\*title\*\*/$title/g; 107 108 $line =~ s/\*\*about\*\*/$about/g; 108 $line =~ s/\*\*plugins\*\*/$plugins /g;109 $line =~ s/\*\*plugins\*\*/$pluginstring/g; 109 110 $line =~ s/\*\*refine\*\*/$refine/g; 110 111 … … 119 120 120 121 121 my (@indexes, @indexestext );122 my (@indexes, @indexestext, @plugin); 122 123 123 124 # get and check options … … 132 133 'title/.+/', \$title, 133 134 'about/.+/', \$about, 134 'plugin s/.+/GMLPlug TEXTPlug ArcPlug RecPlug/', \$plugins,135 'plugin/.+', \@plugin, 135 136 'refine/.+/', \$refine 136 137 )) { … … 138 139 die "\n"; 139 140 } 140 141 142 # load default plugins if none were on command line 143 if (!scalar(@plugin)) { 144 @plugin = (GMLPlug,TEXTPlug,ArcPlug,RecPlug); 145 } 146 141 147 # get and check the collection name 142 148 ($collection) = @ARGV; … … 195 201 } 196 202 203 $pluginstring = ""; 204 foreach $plugin (@plugin) { 205 $pluginstring .= "plugin $plugin\n"; 206 } 197 207 198 208 # make sure the model collection exists -
trunk/gsdl/cgi-bin/webpage_buildcol.pl
r841 r1129 1 #!/usr/ local/bin/perl5-w1 #!/usr/bin/perl -w 2 2 3 3 ########################################################################### … … 118 118 my $full_importname = &util::filename_cat($full_dirname,"import"); 119 119 120 my $log_filename = &util::filename_cat($ENV{'GSDLHOME'}," log","$dirname.bld");120 my $log_filename = &util::filename_cat($ENV{'GSDLHOME'},"etc","$dirname.bld"); 121 121 if (!open (LOGOUT, ">$log_filename")) 122 122 { -
trunk/gsdl/cgi-bin/webpage_buildstatus.pl
r724 r1129 1 #!/usr/ local/bin/perl5-w1 #!/usr/bin/perl -w 2 2 3 3 ########################################################################### -
trunk/gsdl/cgi-bin/webpage_delcol.pl
r841 r1129 1 #!/usr/ local/bin/perl5-w1 #!/usr/bin/perl -w 2 2 3 3 ########################################################################### … … 140 140 my $mess_url = "$args->{'httpbuild'}&bca=mess"; 141 141 $mess_url .= "&bc1dirname=$dirname" if ($delete_area ne "all"); 142 print " Content: text/html\n\n$mess_url&head=_headdone_&mess=_messdonedelcol_\n\n";142 print "Location: $mess_url&head=_headdone_&mess=_messdonedelcol_\n\n"; 143 143 return; 144 144 -
trunk/gsdl/cgi-bin/webpage_editcol.pl
r724 r1129 1 #!/usr/ local/bin/perl5-w1 #!/usr/bin/perl -w 2 2 3 3 ########################################################################### -
trunk/gsdl/cgi-bin/webpage_mkcol.pl
r724 r1129 1 #!/usr/ local/bin/perl5-w1 #!/usr/bin/perl -w 2 2 3 3 ########################################################################### … … 153 153 $cmd .= " -creator $contact_email"; 154 154 $cmd .= " -about \"$about_desc\""; 155 $cmd .= " -plugins \"GMLPlug ${src_format}Plug ArcPlug RecPlug\""; 155 $cmd .= " -plugin \"GMLPlug\""; 156 $cmd .= " -plugin \"${src_format}Plug\""; 157 $cmd .= " -plugin \"ArcPlug\""; 158 $cmd .= " -plugin \"RecPlug\""; 156 159 ### $cmd .= " -refine \"$refine_plugs\""; 157 160 $cmd .= " $unique_dirname"; … … 162 165 { 163 166 # append copydir, file_or_url and input_dir to end of collect.cfg 167 # we'll also append DocumentUseHTML if processing HTML docs 164 168 my $cfg_filename 165 169 = &util::filename_cat($ENV{'GSDLHOME'},"collect",$unique_dirname, … … 170 174 { 171 175 print CFGAPP "\n"; 176 177 if ($src_format eq "HTML") { 178 print CFGAPP "format\tDocumentUseHTML\ttrue\n\n"; 179 } 180 172 181 print CFGAPP "building\tfileorurl\t$file_or_url\n"; 173 182 print CFGAPP "building\tinputdir\t$input_dir\n"; -
trunk/gsdl/macros/authen.dm
r876 r1129 11 11 _content_ { 12 12 <br><br><br><br> 13 _messagestatus_14 15 13 <form name="login" method="get" action="_gwcgi_"> 16 14 <input type=hidden name="e" value="_If_(_cgiarger_,_cgiarger_,_decodedcompressedoptions_)"> 17 15 _hiddenargs_ 16 <center><table width=_pagewidth_> 17 <tr><td> 18 _messagestatus_ 19 </td></tr> 18 20 19 <table border=0> 20 <tr><td>_textusername_</td><td><input type="text" name="un" value="_cgiargun_" size=10></td></tr> 21 <tr><td>_textpassword_</td><td><input type="password" name="pw" size=10></td></tr> 22 <tr><td></td><td><input type="submit" value="sign in"></td></tr> 21 <tr><td> 22 <table><td>_textusername_</td> 23 <td><input type="text" name="un" value="_cgiargun_" size=10></td> 24 <td></td></tr> 25 <tr><td>_textpassword_</td> 26 <td><input type="password" name="pw" size=10></td> 27 <td><input type="submit" value="sign in"></td> 28 </tr> 29 </table> 30 <td></tr> 23 31 </table> 24 32 </form> -
trunk/gsdl/macros/build.dm
r725 r1129 10 10 <table width=100%> 11 11 <tr> 12 <td><img src=" /gsdl/images/gsdl_height.gif" width=2 height=77></td>12 <td><img src="_httpimg_/spacer.gif" width=2 height=77></td> 13 13 <td>_iconblankbar_ 14 14 <center><h2>_1_</h2></center> … … 44 44 } 45 45 46 _httpiconstop_ {_httpimg_/stop.gif} 46 47 47 48 _iconwizardnext_{<img src="_httpiconmore_" align=absbottom … … 73 74 _bcargfileorurl_ {file} 74 75 _bcarginputdir_ {} 75 _bcargcopydir_ { }76 _bcargcopydir_ {yes} 76 77 _bcargingsdlarea_ {no} 77 78 _bcargacronyms_ {off} … … 287 288 This process is structured as a series of Web pages, overseen by the 288 289 new-collection "wizard." The wizard bar at the bottom of the page 289 shows you the sequence sof pages to be completed. You can return to290 a previous lypage by clicking on the corresponding item in the wizard bar.290 shows you the sequence of pages to be completed. You can return to 291 a previous page by clicking on the corresponding item in the wizard bar. 291 292 </td> 292 293 </tr> … … 454 455 \} 455 456 \} 456 457 457 simulate_get_action("_httpbuild_&bca=newcol"); 458 458 \} … … 654 654 Note, once a collection has been built it 655 655 is not necessary for the source data to remain in the Greenstone 656 collection area -- the collection can be safely access , browsed656 collection area -- the collection can be safely accessed, browsed 657 657 and searched without this. If you wish, however, to make changes 658 to the collection and then rebuilt it then 659 the source data must still be avialable. 658 to the collection and then rebuild, the source data must still be available. 660 659 </font> 661 660 </td> … … 906 905 907 906 <tr> 908 <td>Colle tion to edit:</td>907 <td>Collection to edit:</td> 909 908 <td colspan=3> 910 909 _fullnamemenu_ … … 1189 1188 1190 1189 <!-- Hide code from non-js browsers 1191 var timer = 5;1190 var timer = 10; 1192 1191 function restart_count_down() \{ 1193 timer= 5;1192 timer=10; 1194 1193 setTimeout("count_down()",1000); 1195 1194 \} … … 1394 1393 1395 1394 <tr> 1396 <td>Colle tion to delete:</td>1395 <td>Collection to delete:</td> 1397 1396 <td colspan=3> 1398 1397 _fullnamemenu_ -
trunk/gsdl/macros/english2.dm
r1095 r1129 92 92 _heightselcolgr_ {17} 93 93 _altselcolgr_ {"Select a collection"} 94 95 96 ######################################################################97 # 'status' pages98 package status99 ######################################################################100 101 102 #------------------------------------------------------------103 # text macros104 #------------------------------------------------------------105 106 _textframebrowser_ {You must have a frame enabled browser to view this.}107 _textusermanage_ {User management}108 _textlistusers_ {list users}109 _textaddusers_ {add a new user}110 111 _textinfo_ {Information}112 _textgeneral_ {general}113 _textarguments_ {arguments}114 _textactions_ {actions}115 _textprotocols_ {protocols}116 117 _textcollections_ {Collections}118 _textnewcoll_ {new collection}119 _texteditcoll_ {edit collection}120 _textbuildcoll_ {build collection}121 _textdeletecoll_ {delete collection}122 123 _textlogs_ {Logs}124 _textinitlog_ {init log}125 _texterrorlog_ {error log}126 127 _textreturnhome_ {Return to home page}128 129 _titlewelcome_ { Maintenance and Administration }130 131 _welcome_ {132 133 <p> Maintenance and administration services available include:134 view on-line logs;135 create, maintain and update collections;136 and access technical information such as CGI arguments.137 These services are accessed using the138 side navigation bar on the lefthand side of the page.139 }140 141 142 #------------------------------------------------------------143 # icons144 #------------------------------------------------------------145 94 146 95 -
trunk/gsdl/macros/status.dm
r931 r1129 22 22 <table width=100%> 23 23 <tr> 24 <td><img src=" /gsdl/images/spacer.gif" width=2 height=77></td>24 <td><img src="_httpimg_/spacer.gif" width=2 height=77></td> 25 25 <td>_iconblankbar_ 26 26 <center><h2>_1_</h2></center> … … 57 57 _select_ { 58 58 <a href="_httppagehome_" target=_top border=0><img src="_httpimg_/gsdl.gif"></a> 59 <p> 60 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=welcome" target=infoframe>_textadminhome_</a> 61 <a href="_httppagehome_" target=_top>_textreturnhome_</a> 62 59 63 60 64 _If_("_cgiarguma_" ne "\_cgiarguma\_", … … 80 84 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=initlog" target=infoframe>_textinitlog_</a><br> 81 85 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=errorlog" target=infoframe>_texterrorlog_</a> 82 83 <p>84 <a href="_httppagehome_" target=_top>_textreturnhome_</a>85 86 } 86 87 87 88 89 _textframebrowser_ {You must have a frame enabled browser to view this.} 90 _textusermanage_ {User management} 91 _textlistusers_ {list users} 92 _textaddusers_ {add a new user} 93 94 _textinfo_ {Information} 95 _textgeneral_ {general} 96 _textarguments_ {arguments} 97 _textactions_ {actions} 98 _textprotocols_ {protocols} 99 100 _textcollections_ {Collection management} 101 _textnewcoll_ {create new collection} 102 _texteditcoll_ {edit collection} 103 _textbuildcoll_ {build collection} 104 _textdeletecoll_ {delete collection} 105 106 _textlogs_ {Logs} 107 _textinitlog_ {init log} 108 _texterrorlog_ {error log} 109 110 _textadminhome_ {admin home} 111 _textreturnhome_ {Greenstone home} 112 113 _titlewelcome_ { Maintenance and Administration } 114 115 _welcome_ { 116 117 <center> 118 <table width=_pagewidth_><tr><td> 119 Maintenance and administration services available include: 120 <ul> 121 <li>view on-line logs 122 <li>create, maintain and update collections 123 <li>access technical information such as CGI arguments 124 </ul> 125 These services are accessed using the side navigation bar on the 126 lefthand side of the page. 127 <p> 128 _iconblankbar_ 129 </td></tr> 130 <tr><th align=left><br>Collection Status</th></tr> 131 <tr><td> 132 <font color=gray> 133 Collections will only appear as "running" if their build.cfg 134 files exist, are readable, contain a valid builddate field (i.e. > 0), 135 and are in the collection's index directory (i.e. NOT the building 136 directory). 137 <p> 138 click <i>abbrev.</i> for information on a collection 139 <br> 140 click <i>collection</i> to view a collection 141 </font> 142 </td></tr> 143 </table> 144 </center> 145 } -
trunk/gsdl/macros/users.dm
r876 r1129 87 87 </font></td></tr> 88 88 <tr><td>comment</td><td colspan=2><input type="text" name="umc" value="_users:usersargc_" size=50></td></tr> 89 <tr></td><td><td><input type="submit" name=beu value="submit"></td></tr> 89 <tr><td></td><td colspan=2><input type="submit" name=beu value="submit"> 90 <input type="submit" name=uma value="cancel"></td></tr> 90 91 </table> 91 92 </form> -
trunk/gsdl/src/recpt/authenaction.cpp
r755 r1129 28 28 /* 29 29 $Log$ 30 Revision 1.10 2000/04/19 22:30:23 sjboddie 31 tidied up status pages and end-user collection building 32 30 33 Revision 1.9 1999/11/01 21:11:35 sjboddie 31 34 changed arguments passed to many functions … … 300 303 + "_")); 301 304 // change style of header and footer if page is a frame 302 if ( args["sp"] != "frameset") {305 if ((args["sp"].empty()) || (args["sp"] == "frameset")) { 303 306 disp.setmacro ("header", "authen", "_status:infoheader_(Log in)"); 304 307 disp.setmacro ("header", "authenok", "_status:infoheader_(Log in)"); … … 306 309 disp.setmacro ("footer", "authenok", "_status:infofooter_(Log in)"); 307 310 } 308 else {309 // disp.setmacro ("header", "authen", "_Global:header_"); //****310 // disp.setmacro ("header", "authenok", "_Global:header_");311 // disp.setmacro ("footer", "authen", "_Global:footer_");312 // disp.setmacro ("footer", "authenok", "_Global:footer_");313 disp.setmacro ("header", "authen", "_:header_");314 disp.setmacro ("header", "authenok", "_:header_");315 disp.setmacro ("footer", "authen", "_:footer_");316 disp.setmacro ("footer", "authenok", "_:footer_");317 }318 319 311 320 312 // get a list of saved configuration arguments (if possible) -
trunk/gsdl/src/recpt/buildaction.cpp
r1000 r1129 80 80 bool buildaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 81 81 ostream &/*logout*/) { 82 if ((args["bca"] != "buildstatus") && (args["bca"] != "collog")) 82 83 text_t &arg_bca = args["bca"]; 84 if (!((arg_bca == "buildstatus") || (arg_bca == "collog") || (arg_bca == "blankpage") 85 || ((arg_bca == "buildcol") && (args["wizard"] == "buildexec")))) 83 86 { 84 87 // authenticate the user if authentication is avaiable -
trunk/gsdl/src/recpt/statusaction.cpp
r995 r1129 28 28 /* 29 29 $Log$ 30 Revision 1.26 2000/04/19 22:30:23 sjboddie 31 tidied up status pages and end-user collection building 32 30 33 Revision 1.25 2000/02/29 21:00:31 sjboddie 31 34 fixed some compiler warnings … … 138 141 } 139 142 140 void statusaction::output_welcome (cgiargsclass &/*args*/, displayclass &disp, 141 outconvertclass &outconvert, 142 ostream &textout, ostream &/*logout*/) { 143 textout << outconvert << disp << "_status:infoheader_(_titlewelcome_)\n" 144 "_status:welcome_\n" 145 "_status:infofooter_\n"; 143 void statusaction::output_welcome (cgiargsclass &/*args*/, recptprotolistclass *protos, 144 displayclass &disp, outconvertclass &outconvert, 145 ostream &textout, ostream &logout) { 146 147 textout << outconvert << disp 148 << "_status:infoheader_(_titlewelcome_)\n" 149 << "_status:welcome_" 150 << "<center><table width=_pagewidth_>\n" 151 << "<th align=left>abbrev.</th><th align=left>collection</th>" 152 << "<th align=left>public?</th><th align=left>running?</th></tr>\n"; 153 154 recptprotolistclass::iterator rprotolist_here = protos->begin(); 155 recptprotolistclass::iterator rprotolist_end = protos->end(); 156 while (rprotolist_here != rprotolist_end) { 157 if ((*rprotolist_here).p != NULL) { 158 text_t protoname = (*rprotolist_here).p->get_protocol_name(); 159 text_tarray collist; 160 comerror_t err; 161 (*rprotolist_here).p->get_collection_list (collist, err, logout); 162 if (err == noError) { 163 text_tarray::iterator collist_here = collist.begin(); 164 text_tarray::iterator collist_end = collist.end(); 165 166 while (collist_here != collist_end) { 167 168 textout << outconvert << disp 169 << "<tr><td><a href=\"_gwcgi_?e=_compressedoptions_&a=status&sp=collectioninfo&pr=" 170 << protoname 171 << "&c=" 172 << *collist_here 173 << "\">" 174 << *collist_here 175 << "</a></td>"; 176 177 ColInfoResponse_t cinfo; 178 (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout); 179 if (err == noError) { 180 text_t collname = *collist_here; 181 text_tmap::iterator it = cinfo.collectionmeta.find("collectionname"); 182 if (it != cinfo.collectionmeta.end()) collname = (*it).second; 183 184 textout << "<td>"; 185 if (cinfo.buildDate > 0) 186 textout << outconvert << disp 187 << "<a href=\"_httppagex_(about)&c=" << *collist_here 188 << "\" target=_top>"; 189 190 textout << outconvert << disp << collname; 191 192 if (cinfo.buildDate > 0) textout << "</a>"; 193 194 textout << "</td>"; 195 196 if (cinfo.isPublic) textout << "<td>yes</td>"; 197 else textout << "<td>no</td>"; 198 199 if (cinfo.buildDate > 0) 200 textout << outconvert << "<td>yes</td>"; 201 else 202 textout << "<td>no</td>"; 203 204 } else { 205 textout << "<td></td><td></td><td></td>"; 206 } 207 208 textout << "</tr>\n"; 209 collist_here ++; 210 } 211 } 212 } 213 rprotolist_here ++; 214 } 215 216 textout << "</table></center>\n"; 217 textout << outconvert << disp << "_status:infofooter_\n"; 146 218 } 147 219 … … 856 928 } 857 929 858 bool statusaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/,930 bool statusaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 859 931 browsermapclass * /*browsers*/, displayclass &disp, 860 932 outconvertclass &outconvert, ostream &textout, … … 898 970 if (arg_sp == "frameset") output_frameset (args, disp, outconvert, textout, logout); 899 971 else if (arg_sp == "select") output_select (args, disp, outconvert, textout, logout); 900 else if (arg_sp == "welcome") output_welcome (args, disp, outconvert, textout, logout);972 else if (arg_sp == "welcome") output_welcome (args, protos, disp, outconvert, textout, logout); 901 973 else if (arg_sp == "generalinfo") output_generalinfo (args, disp, outconvert, textout, logout); 902 974 else if (arg_sp == "argumentinfo") output_argumentinfo (args, disp, outconvert, textout, logout); -
trunk/gsdl/src/recpt/statusaction.h
r760 r1129 44 44 outconvertclass &outconvert, 45 45 ostream &textout, ostream &logout); 46 46 47 void output_select (cgiargsclass &args, displayclass &disp, 47 48 outconvertclass &outconvert, 48 49 ostream &textout, ostream &logout); 49 50 50 void output_welcome (cgiargsclass &args, displayclass &disp, 51 outconvertclass &outconvert, 52 ostream &textout, ostream &logout); 51 void output_welcome (cgiargsclass &args, recptprotolistclass *protos, 52 displayclass &disp, outconvertclass &outconvert, 53 ostream &textout, ostream &logout); 54 53 55 void output_generalinfo (cgiargsclass &args, displayclass &disp, 54 56 outconvertclass &outconvert, 55 57 ostream &textout, ostream &logout); 58 56 59 void output_argumentinfo (cgiargsclass &args, displayclass &disp, 57 60 outconvertclass &outconvert, 58 61 ostream &textout, ostream &logout); 62 59 63 void output_actioninfo (cgiargsclass &args, displayclass &disp, 60 64 outconvertclass &outconvert, 61 65 ostream &textout, ostream &logout); 66 62 67 void output_protocolinfo (cgiargsclass &args, displayclass &disp, 63 68 outconvertclass &outconvert, 64 69 ostream &textout, ostream &logout); 70 65 71 void output_collectioninfo (cgiargsclass &args, displayclass &disp, 66 72 outconvertclass &outconvert, 67 73 ostream &textout, ostream &logout); 74 68 75 void output_initlog (cgiargsclass &args, displayclass &disp, 69 76 outconvertclass &outconvert, 70 77 ostream &textout, ostream &logout); 78 71 79 void output_errorlog (cgiargsclass &args, displayclass &disp, 72 80 outconvertclass &outconvert,
Note:
See TracChangeset
for help on using the changeset viewer.