Changeset 12017

Timestamp:

2006-07-05T16:30:15+12:00 (18 years ago)

Author:

davidb

Message:

Better sharing of shared macro definitions between the collector and the
depository, through the "abstract" the wizard.

Location:

trunk/gsdl/macros

Files:

• deposit.dm (modified) (1 diff)
• english2.dm (modified) (5 diffs)

trunk/gsdl/macros/deposit.dm

@@ -521 +521 @@
 <table width=_pagewidth_>
 <tr><td>
-</td></tr>
-<tr><td>
-_depositorbar_
+_textfailmsg_
+</td></tr>
+<tr><td>
 </td></tr>
 </table></center>

trunk/gsdl/macros/english2.dm

@@ -311 +311 @@
 _textseconds_ {seconds}
 
+_textfailmsg11_ {
+The collection could not be built as it contains no data. Make sure that at
+least one of the directories or files you specified on the <i>source
+data</i> page exists and is of a type or (in the case of a directory)
+contains files of a type, that Greenstone can process.
+}
+
+_textfailmsg21_ {The collection could not be built (import.pl failed).}
+_textfailmsg31_ {The collection could not be built (buildcol.pl failed).}
+_textfailmsg41_ {The collection was built successfully but could not be installed.}
+_textfailmsg71_ {An unexpected error occurred while attempting to build your collection}
+
+
+_textblcont_ {The build log contains the following information:}
+
 ######################################################################
 # collectoraction
@@ -562 +577 @@
 
 
-_textfailmsg11_ {
-The collection could not be built as it contains no data. Make sure that at
-least one of the directories or files you specified on the <i>source
-data</i> page exists and is of a type or (in the case of a directory)
-contains files of a type, that Greenstone can process.
-}
-
-_textfailmsg21_ {The collection could not be built (import.pl failed).}
-_textblcont_ {The build log contains the following information:}
+_textfailmsg11_ {_wizard:textfailmsg11_}
+_textfailmsg21_ {_wizard:textfailmsg21_}
+_textblcont_ {_wizard:textblcont_}
 
 _texttryagain_ {
@@ -577 +586 @@
 }
 
-_textfailmsg31_ {The collection could not be built (buildcol.pl failed).}
-_textfailmsg41_ {The collection was built successfully but could not be installed.}
-_textfailmsg71_ {An unexpected error occurred while attempting to build your collection}
+_textfailmsg31_ {_wizard:textfailmsg31_}
+_textfailmsg41_ {_wizard:textfailmsg41_}
+_textfailmsg71_ {_wizard:textfailmsg71_}
+
 _textretcoll_ {Return to the collector}
 
@@ -673 +683 @@
 
 ######################################################################
-# collectoraction
+# depositoraction
 package depositor
 ######################################################################
@@ -708 +718 @@
 
 _textbildcancel1_ {_wizard:textbildcancel1_}
+
+_textfailmsg11_ {_wizard:textfailmsg11_}
+_textfailmsg21_ {_wizard:textfailmsg21_}
+_textblcont_ {_wizard:textblcont_}
+
+_texttryagain_ {
+Please <a href="_httppagedepositor_" target=_top>restart the depositor</a>
+and try again.
+}
+
+_textfailmsg31_ {_wizard:textfailmsg31_}
+_textfailmsg41_ {_wizard:textfailmsg41_}
+_textfailmsg71_ {_wizard:textfailmsg71_}
+
+_textretcoll_ {Return to the depositor}
+
+_texttmpfail_ {
+The depositor failed to read from or write to a temporary file or
+directory. Possible causes are:
+<ul>
+<li> Greenstone does not have read/write access to the _gsdlhome_/tmp
+     directory.
+</ul>
+}
+
 
 ######################################################################