Changeset 1507
- Timestamp:
- 2000-09-06T14:14:46+12:00 (24 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/bin/script/build
r1485 r1507 130 130 131 131 foreach $download_dir (@download) { 132 133 # remove any leading or trailing whitespace from filenames (just in case) 134 $download_dir =~ s/^\s+//; 135 $download_dir =~ s/\s+$//; 132 136 133 137 if ($download_dir =~ /^http:\/\//) { … … 141 145 # is a file or directory on the local file system. 142 146 $download_dir =~ s/^file:(\/\/)?//; 147 $download_dir =~ s/^\s+//; # may be whitespace between "file://" and the rest 143 148 144 149 if (-e $download_dir) { … … 152 157 &append_file ($out, "$outfile.download"); 153 158 } else { 154 print $out "WARNING: $download_dirdoes not exist\n";159 print $out "WARNING: '$download_dir' does not exist\n"; 155 160 } 156 161 } … … 184 189 } else { 185 190 # no import or archives 186 print $out "build: ERROR: The $collection collection has no import\n"; 187 print $out " or archives data. Try downloading an unbuilt version\n"; 188 print $out " of the collection from www.nzdl.org\n"; 191 print $out "build: ERROR: The $collection collection has no import or archives data.\n"; 189 192 &final_out (1) if $use_out; 190 193 die "\n"; -
trunk/gsdl/macros/collect.dm
r1485 r1507 9 9 # this is just like the _gsimage_ macro but it calls the check_submit() javascript 10 10 # function instead of linking directly to the page (_1_ argument isn't used) 11 _gsjimage_ {<a href="javascript:check\_submit('_4_');" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);" ><img11 _gsjimage_ {<a href="javascript:check\_submit('_4_');" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);" target=_top><img 12 12 name="_4_" src="_2_" onLoad="gbutton(this,'_3_');" border=0 alt="_5_"></a>} 13 _gsjimage_ [v=1] {<a href="javascript:check\_submit('_4_');" >_5_</a><br>}13 _gsjimage_ [v=1] {<a href="javascript:check\_submit('_4_');" target=_top>_5_</a><br>} 14 14 15 15 # _gstimage_ is also similar to _gsimage_ but is used where buttons occur in a sub-frame and … … 546 546 547 547 <h4>Input source:</h4> 548 _typeselect_(1,file)<input type=text name="bc1inputdir1" value="_cgiargbc1inputdir1_" size=60>548 <nobr>_typeselect_(1,file)<input type=text name="bc1inputdir1" value="_cgiargbc1inputdir1_" size=60></nobr> 549 549 <br> 550 _typeselect_(2,http)<input type=text name="bc1inputdir2" value="_cgiargbc1inputdir2_" size=60>550 <nobr>_typeselect_(2,http)<input type=text name="bc1inputdir2" value="_cgiargbc1inputdir2_" size=60></nobr> 551 551 <br> 552 _typeselect_(3,ftp)<input type=text name="bc1inputdir3" value="_cgiargbc1inputdir3_" size=60>552 <nobr>_typeselect_(3,ftp)<input type=text name="bc1inputdir3" value="_cgiargbc1inputdir3_" size=60></nobr> 553 553 <br> 554 _typeselect_(4,file)<input type=text name="bc1inputdir4" value="_cgiargbc1inputdir4_" size=60>554 <nobr>_typeselect_(4,file)<input type=text name="bc1inputdir4" value="_cgiargbc1inputdir4_" size=60></nobr> 555 555 <br> 556 556 <font color="#909090"> … … 675 675 _bildcontent_ { 676 676 <html> 677 <frameset rows="*,150" border=0> 677 <head> 678 <script> 679 <!-- 680 function check\_submit (gotopage) \{ 681 var form = document.collectorform; 682 form.cp.value = gotopage; 683 form.submit(); 684 \} 685 // --> 686 </script> 687 <form name="collectorform" method=post action="_gwcgi_"> 688 <input type=hidden name="e" value="_decodedcompressedoptions_"> 689 <input type=hidden name="cp" value="_cgiargcp_"> 690 </head> 691 692 <frameset rows="*,160" border=0> 678 693 <noframes><body bgcolor="#ffffff"> 679 694 <p>You must have a frame enabled browser to obtain feedback … … 702 717 703 718 # header overridden to allow base target to be set 719 # also no page banner to maximise what we can fit in the frame without scrolling 704 720 _bildframe1header_ {_cgihead_ 705 721 <html> … … 711 727 <body bgcolor="\#ffffff" text="\#000000" link="\#006666" 712 728 alink="\#cc9900" vlink="\#666633" background="_httpiconchalk_"> 713 _startspacer_ _pagebanner_729 _startspacer_ 714 730 } 715 731 _bildframe1header_[v=1] {_cgihead_ … … 722 738 <body bgcolor="\#ffffff" text="\#000000" link="\#006666" 723 739 alink="\#cc9900" vlink="\#666633" background="_httpiconchalk_"> 724 _pagebanner_ 725 } 726 _bildframe1scriptextra_ { 727 function check\_submit (gotopage) \{ 728 var form = document.collectorform; 729 form.cp.value = gotopage; 730 form.submit(); 731 \} 732 } 740 } 741 _bildframe1scriptextra_ {} 733 742 _bildframe1content_ { 734 743 <form name="collectorform" method=post action="_gwcgi_"> … … 781 790 <input type=hidden name="e" value="_decodedcompressedoptions_"> 782 791 <input type=hidden name="cp" value="_cgiargcp_"> 792 </form> 783 793 <center> 784 794 <table width=_pagewidth_> … … 798 808 </td></tr> 799 809 </table></center> 800 </form>801 810 } 802 811 … … 854 863 _bilddonescriptextra_ {} 855 864 _bilddonecontent_ { 856 <form name="collectorform" method=post action="_gwcgi_">857 <input type=hidden name="e" value="_decodedcompressedoptions_">858 865 <center> 859 866 <table width=_pagewidth_> … … 867 874 </td></tr> 868 875 </table></center> 869 </form>870 876 } 871 877 … … 878 884 _htmlhead_(background="_httpiconchalk_")_startspacer_ 879 885 } 880 _bildfailscriptextra_ {} 886 _bildfailscriptextra_ { 887 function check\_submit (gotopage) \{ 888 var form = document.collectorform; 889 form.cp.value = gotopage; 890 form.submit(); 891 \} 892 } 881 893 _bildfailcontent_ { 882 894 <form name="collectorform" method=post action="_gwcgi_"> 883 895 <input type=hidden name="e" value="_decodedcompressedoptions_"> 896 <input type=hidden name="cp" value="_cgiargcp_"> 897 </form> 884 898 <center> 885 899 <table width=_pagewidth_> … … 888 902 <br> The build log contains the following: 889 903 <p>_faillog_ 890 </td></tr> 891 </table></center> 892 </form> 904 905 <p><center> 906 _collectorbar_ 907 </center> 908 909 </td></tr> 910 </table></center> 893 911 } 894 912 -
trunk/gsdl/src/recpt/collectoraction.cpp
r1485 r1507 350 350 } 351 351 352 if (current_page == "bildstatus" ) {352 if (current_page == "bildstatus" || current_page == "bildcancel") { 353 353 // if .final file exists then build has finished 354 354 text_t fbld = filename_cat (gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld.final"); … … 589 589 if (enabled) { 590 590 text_t gsmacro = "_gsimage_"; 591 if (thispage == "info" || thispage == "srce" || thispage == "conf") { 591 if (thispage == "info" || thispage == "srce" || thispage == "conf" || 592 thispage == "bildcancel" || thispage == "bildfail") { 592 593 gsmacro = "_gsjimage_"; 593 594 } else if (type == "view") { … … 683 684 fullnamemenu.push_back ('>'); 684 685 fullnamemenu += fullnames[i]; 685 if (write_protected[i]) fullnamemenu += " <b>(write protected)</b>";686 686 fullnamemenu.push_back ('\n'); 687 687 … … 805 805 806 806 if (collector_page == "new") { 807 collectorbar += "<td>_icongreyarrow_</td>\n"; 807 808 collectorbar += get_button (collector_page, "green", "info", true); 808 809 collectorbar += "<td>_icongreyarrow_</td>\n"; … … 816 817 817 818 } else if (collector_page == "info") { 819 collectorbar += "<td>_icongreyarrow_</td>\n"; 818 820 collectorbar += get_button (collector_page, "yellow", "info", false); 819 821 collectorbar += "<td>_icongreyarrow_</td>\n"; … … 825 827 collectorbar += "<td>_icongreyarrow_</td>\n"; 826 828 collectorbar += get_button (collector_page, "grey", "view", false); 827 collectorbar += "</tr><tr><td align=center>_icongreyuparrow_</td><td colspan=8></td>\n";829 collectorbar += "</tr><tr><td></td><td align=center>_icongreyuparrow_</td><td colspan=8></td>\n"; 828 830 829 831 } else if (collector_page == "srce") { 832 collectorbar += "<td>_icongreyarrow_</td>\n"; 830 833 if (esrce == 1) { 831 834 // if we came from the "change an existing collection" page previous button(s) … … 843 846 collectorbar += "<td>_icongreyarrow_</td>\n"; 844 847 collectorbar += get_button (collector_page, "grey", "view", false); 845 collectorbar += "</tr><tr><td colspan= 2></td><td align=center>_icongreyuparrow_</td><td colspan=6></td>\n";848 collectorbar += "</tr><tr><td colspan=3></td><td align=center>_icongreyuparrow_</td><td colspan=6></td>\n"; 846 849 847 850 } else if (collector_page == "conf") { 851 collectorbar += "<td>_icongreyarrow_</td>\n"; 848 852 // disable appropriate buttons if we came from "change an existing collection" 849 853 // page … … 865 869 collectorbar += "<td>_icongreyarrow_</td>\n"; 866 870 collectorbar += get_button (collector_page, "grey", "view", false); 867 collectorbar += "</tr><tr><td colspan= 4></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n";871 collectorbar += "</tr><tr><td colspan=5></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n"; 868 872 869 873 } else if (collector_page == "bilddone") { 874 collectorbar += "<td>_icongreyarrow_</td>\n"; 870 875 // all previous buttons grey after build was completed 871 876 collectorbar += get_button (collector_page, "grey", "info", false); … … 878 883 collectorbar += "<td>_icongreyarrow_</td>\n"; 879 884 collectorbar += get_button (collector_page, "green", "view", true); 880 collectorbar += "</tr><tr><td colspan=6></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n"; 881 882 } else if (collector_page == "bildcancel") { 885 collectorbar += "</tr><tr><td colspan=7></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n"; 886 887 } else if (collector_page == "bildcancel" || collector_page == "bildfail") { 888 collectorbar += "<td>_icongreyarrow_</td>\n"; 883 889 // disable appropriate buttons if we came from "change an existing collection" 884 890 // page … … 973 979 } 974 980 975 if (collector_page == "bildcancel") { 976 // cancel the build 981 if (collector_page == "bildcancel" || collector_page == "bildfail") { 982 // cancel the build (we'll also use the cancel_build script to tidy 983 // up if the build failed) 977 984 gsdl_cancel_build (args, logout); 978 985 }
Note:
See TracChangeset
for help on using the changeset viewer.