Skip to content

Commit

Permalink
Merge branch 'release/1.20.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@olovy
olovy committed Nov 27, 2020
2 parents a6828ec + 612593d commit 1eb5742
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 349 deletions.
111 changes: 4 additions & 107 deletions addjob.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</tr>
<tr>
<td colspan="2">
<font color="#ff0000">OBS! Lägg inte ett startdatum som är äldre än två år. Sökningen blir då för tung och kommer inte att fungera. Använd "fullständigt uttag" i vänstermenun om det är det ni vill ha.</font></td></tr>
<font color="#ff0000">OBS! Lägg inte in ett intervall som är större än 6 månader. Sökningen blir då för tung och kommer inte att fungera. Använd "fullständigt uttag" i vänstermenyn om det är det ni vill ha.</font></td></tr>
<tr>
<td nowrap class="default">&nbsp;&nbsp;start (yyyy-mm-dd):</td>
<td><input type="text" size="10" name="start"/></td>
Expand Down Expand Up @@ -132,7 +132,7 @@
</tr>
<tr class="default">
<td>&nbsp;&nbsp;diakrithantering:</td>
<td><select name="composestrategy"><option value="compose" <% if (properties.getProperty("composestrategy", "").equalsIgnoreCase("composelatin1")) out.print("selected"); %>>prekomponera latin-1 subset</option><option value="compose" <% if (properties.getProperty("composestrategy", "composelatin1").equalsIgnoreCase("compose")) out.print("selected"); %>>prekomponera alla</option><option value="decompose" <% if (properties.getProperty("composestrategy", "composelatin1").equalsIgnoreCase("decompose")) out.print("selected"); %>>dekomponera alla</option></select> <a target="_new" href="http://www.libris.kb.se/tjanster/teknisk_info/export_batchuttag_ny.jsp#diakrithantering">förklaring</a></td>
<td><select name="composestrategy"><option value="compose" <% if (properties.getProperty("composestrategy", "").equalsIgnoreCase("composelatin1")) out.print("selected"); %>>prekomponera latin-1 subset</option><option value="compose" <% if (properties.getProperty("composestrategy", "composelatin1").equalsIgnoreCase("compose")) out.print("selected"); %>>prekomponera alla</option><option value="decompose" <% if (properties.getProperty("composestrategy", "composelatin1").equalsIgnoreCase("decompose")) out.print("selected"); %>>dekomponera alla</option></select> <a target="_new" href="https://www.kb.se/samverkan-och-utveckling/libris/att-anvanda-librisdata/postoverforing.html">förklaring</a></td>
</tr>
<tr class="default">
<td>&nbsp;&nbsp;auktoritetsposter:</td>
Expand Down Expand Up @@ -165,112 +165,9 @@
<td colspan="2" class="default"><b>&nbsp;tidpunkt för export</b></td>
</tr>
<tr>
<td class="default" colspan="2">
&nbsp;&nbsp;år:&nbsp;
<select name="year">
<option value="1970">välj år</option>
<option value="2005">2005</option>
<option value="2006">2006</option>
<option value="2007">2007</option>
<option value="2008">2008</option>
<option value="2009">2009</option>
<option value="2010">2010</option>
<option value="2011">2011</option>
<option value="2012">2012</option>
<option value="2013">2013</option>
<option value="2014">2014</option>
<option value="2015">2015</option>
<option value="2016">2016</option>
<option value="2017">2017</option>
<option value="2018">2018</option>
</select>
&nbsp;&nbsp;månad:&nbsp;
<select name="month">
<option value="01">välj månad</option>
<option value="01">januari</option>
<option value="02">february</option>
<option value="03">mars</option>
<option value="04">april</option>
<option value="05">maj</option>
<option value="06">juni</option>
<option value="07">juli</option>
<option value="08">augusti</option>
<option value="09">september</option>
<option value="10">oktober</option>
<option value="11">november</option>
<option value="12">december</option>
</select>
&nbsp;&nbsp;dag i månad:
<select name="day_in_month">
<option value="01">välj dag</option>
<option value="01">01</option>
<option value="02">02</option>
<option value="03">03</option>
<option value="04">04</option>
<option value="05">05</option>
<option value="06">06</option>
<option value="07">07</option>
<option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
</select>
</td>
</tr>
<tr><td colspan="2" class="default">&nbsp;</td></tr>
<tr bgcolor="#dfdfdf">
<td colspan="2" class="default"><b>&nbsp;leverans</b></td>
</tr>
<tr class="default">
<td colspan="2">
&nbsp;&nbsp;<input type="radio" name="delivery_type" value="LIBRISFTP" <% if (properties.getProperty("delivery_type", "LIBRISFTP").equalsIgnoreCase("LIBRISFTP")) out.print("checked=\"checked\""); %>>LIBRIS FTP-server (i mappen '/pub/export2/<% out.print(request.getParameter("name")); %>/marc')
&nbsp;&nbsp;<input type="radio" name="delivery_type" value="EXTFTP" <% if (properties.getProperty("delivery_type", "").equalsIgnoreCase("EXTFTP")) out.print("checked=\"checked\""); %>>egen FTP-server (fyll i nedan)
</td>
</tr>
<tr class="default">
<td>&nbsp;&nbsp;server:</td><td><input name="ftpserver" value="<% out.print(properties.getProperty("ftpserver", "")); %>"></td>
</tr>
<tr class="default">
<td>&nbsp;&nbsp;användare:</td><td><input name="ftpuser" value="<% out.print(properties.getProperty("ftpuser", "")); %>"></td>
</tr>
<tr class="default">
<td>&nbsp;&nbsp;lösenord:</td><td><input name="ftppassword" value="<% out.print(properties.getProperty("ftppassword", "")); %>"></td>
</tr>
<tr class="default">
<td>&nbsp;&nbsp;katalog:</td><td><input name="ftpdirectory" value="<% out.print(properties.getProperty("ftpdirectory", "")); %>"></td>
</tr>
<tr><td colspan="2" class="default">&nbsp;</td></tr>
<tr bgcolor="#dfdfdf">
<td colspan="2" class="default"><b>&nbsp;e-post</b></td>
</tr>
<tr>
<td nowrap class="default">&nbsp;&nbsp;statusrapport till:</td>
<td><input type="text" size="30" name="contact" value="<% out.print(properties.getProperty("contact", "")); %>"/></td>
</tr>
<tr>
<td nowrap class="default">&nbsp;&nbsp;felrapport till:</td>
<td><input type="text" size="30" name="errcontact" value="<% out.print(properties.getProperty("errcontact", "")); %>"/></td>
<td colspan="2" class="default">&nbsp;<font color="#ff0000">Uttaget levereras nästkommande helg (i mappen '/pub/export2/<% out.print(request.getParameter("name")); %>/marc/user-ordered-export.marc')</font></td>
</tr>

<tr><td colspan="2" class="default">&nbsp;</td></tr>
<tr>
<td colspan="2" align="center"><input type="submit" value="spara">&nbsp;<input type="reset" value="återställ"></form></tr>
Expand Down
Loading

0 comments on commit 1eb5742

Please sign in to comment.