Goobi.Presentation

Merge lp:~sebastian-meyer/goobi-presentation/bug-984775 into lp:goobi-presentation/1.1

  1. bug-984775
  2. Merge into 1.1
Proposed by Sebastian Meyer
Status: Merged
Merged at revision: 83
Proposed branch: lp:~sebastian-meyer/goobi-presentation/bug-984775
Merge into: lp:goobi-presentation/1.1
Diff against target: 350 lines (+65/-34)
7 files modified
dlf/lib/ISO-639/iso-639-1.xml (+21/-20)
dlf/lib/ISO-639/iso-639-2b.xml (+11/-8)
dlf/modules/newclient/locallang.xml (+2/-0)
dlf/modules/newclient/metadata.inc.php (+15/-1)
dlf/plugins/collection/class.tx_dlf_collection.php (+1/-1)
dlf/plugins/listview/class.tx_dlf_listview.php (+1/-1)
dlf/plugins/search/class.tx_dlf_search.php (+14/-3)
To merge this branch: bzr merge lp:~sebastian-meyer/goobi-presentation/bug-984775
Reviewer Review Type Date Requested Status
Sebastian Meyer Approve
Review via email: mp+105767@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastian Meyer (sebastian-meyer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dlf/lib/ISO-639/iso-639-1.xml'
--- dlf/lib/ISO-639/iso-639-1.xml 2012-03-20 14:11:28 +0000
+++ dlf/lib/ISO-639/iso-639-1.xml 2012-05-15 07:32:27 +0000
@@ -19,7 +19,7 @@
19 <label index="bg">Bulgarian</label>19 <label index="bg">Bulgarian</label>
20 <label index="bh">Bihari</label>20 <label index="bh">Bihari</label>
21 <label index="bi">Bislama</label>21 <label index="bi">Bislama</label>
22 <label index="bn">Bengali, Bangla</label>22 <label index="bn">Bengali</label>
23 <label index="bo">Tibetan</label>23 <label index="bo">Tibetan</label>
24 <label index="br">Breton</label>24 <label index="br">Breton</label>
25 <label index="ca">Catalan</label>25 <label index="ca">Catalan</label>
@@ -28,7 +28,7 @@
28 <label index="cy">Welsh</label>28 <label index="cy">Welsh</label>
29 <label index="da">Danish</label>29 <label index="da">Danish</label>
30 <label index="de">German</label>30 <label index="de">German</label>
31 <label index="dz">Bhutani</label>31 <label index="dz">Dzongkha</label>
32 <label index="el">Greek</label>32 <label index="el">Greek</label>
33 <label index="en">English</label>33 <label index="en">English</label>
34 <label index="eo">Esperanto</label>34 <label index="eo">Esperanto</label>
@@ -37,12 +37,12 @@
37 <label index="eu">Basque</label>37 <label index="eu">Basque</label>
38 <label index="fa">Persian</label>38 <label index="fa">Persian</label>
39 <label index="fi">Finnish</label>39 <label index="fi">Finnish</label>
40 <label index="fj">Fiji</label>40 <label index="fj">Fijian</label>
41 <label index="fo">Faroese</label>41 <label index="fo">Faroese</label>
42 <label index="fr">French</label>42 <label index="fr">French</label>
43 <label index="fy">Frisian</label>43 <label index="fy">Frisian</label>
44 <label index="ga">Irish</label>44 <label index="ga">Irish</label>
45 <label index="gd">Scots Gaelic</label>45 <label index="gd">Scottish Gaelic</label>
46 <label index="gl">Galician</label>46 <label index="gl">Galician</label>
47 <label index="gn">Guarani</label>47 <label index="gn">Guarani</label>
48 <label index="gu">Gujarati</label>48 <label index="gu">Gujarati</label>
@@ -54,7 +54,7 @@
54 <label index="hy">Armenian</label>54 <label index="hy">Armenian</label>
55 <label index="ia">Interlingua</label>55 <label index="ia">Interlingua</label>
56 <label index="id">Indonesian</label>56 <label index="id">Indonesian</label>
57 <label index="ie">Interlingue</label>57 <label index="ie">Interlingue, Occidental</label>
58 <label index="ik">Inupiak</label>58 <label index="ik">Inupiak</label>
59 <label index="is">Icelandic</label>59 <label index="is">Icelandic</label>
60 <label index="it">Italian</label>60 <label index="it">Italian</label>
@@ -62,21 +62,22 @@
62 <label index="iw">Hebrew</label>62 <label index="iw">Hebrew</label>
63 <label index="ja">Japanese</label>63 <label index="ja">Japanese</label>
64 <label index="ji">Yiddish</label>64 <label index="ji">Yiddish</label>
65 <label index="jv">Javanese</label>
65 <label index="jw">Javanese</label>66 <label index="jw">Javanese</label>
66 <label index="ka">Georgian</label>67 <label index="ka">Georgian</label>
67 <label index="kk">Kazakh</label>68 <label index="kk">Kazakh</label>
68 <label index="kl">Greenlandic</label>69 <label index="kl">Kalaallisut, Greenlandic</label>
69 <label index="km">Cambodian</label>70 <label index="km">Khmer</label>
70 <label index="kn">Kannada</label>71 <label index="kn">Kannada</label>
71 <label index="ko">Korean</label>72 <label index="ko">Korean</label>
72 <label index="ks">Kashmiri</label>73 <label index="ks">Kashmiri</label>
73 <label index="ku">Kurdish</label>74 <label index="ku">Kurdish</label>
74 <label index="ky">Kirghiz</label>75 <label index="ky">Kirghiz, Kyrgyz</label>
75 <label index="la">Latin</label>76 <label index="la">Latin</label>
76 <label index="ln">Lingala</label>77 <label index="ln">Lingala</label>
77 <label index="lo">Laothian</label>78 <label index="lo">Lao</label>
78 <label index="lt">Lithuanian</label>79 <label index="lt">Lithuanian</label>
79 <label index="lv">Latvian, Lettish</label>80 <label index="lv">Latvian</label>
80 <label index="mg">Malagasy</label>81 <label index="mg">Malagasy</label>
81 <label index="mi">Maori</label>82 <label index="mi">Maori</label>
82 <label index="mk">Macedonian</label>83 <label index="mk">Macedonian</label>
@@ -92,21 +93,21 @@
92 <label index="nl">Dutch</label>93 <label index="nl">Dutch</label>
93 <label index="no">Norwegian</label>94 <label index="no">Norwegian</label>
94 <label index="oc">Occitan</label>95 <label index="oc">Occitan</label>
95 <label index="om">(Afan) Oromo</label>96 <label index="om">Oromo</label>
96 <label index="or">Oriya</label>97 <label index="or">Oriya</label>
97 <label index="pa">Punjabi</label>98 <label index="pa">Panjabi</label>
98 <label index="pl">Polish</label>99 <label index="pl">Polish</label>
99 <label index="ps">Pashto, Pushto</label>100 <label index="ps">Pushto</label>
100 <label index="pt">Portuguese</label>101 <label index="pt">Portuguese</label>
101 <label index="qu">Quechua</label>102 <label index="qu">Quechua</label>
102 <label index="rm">Rhaeto-Romance</label>103 <label index="rm">Romansh</label>
103 <label index="rn">Kirundi</label>104 <label index="rn">Rundi</label>
104 <label index="ro">Romanian</label>105 <label index="ro">Romanian</label>
105 <label index="ru">Russian</label>106 <label index="ru">Russian</label>
106 <label index="rw">Kinyarwanda</label>107 <label index="rw">Kinyarwanda</label>
107 <label index="sa">Sanskrit</label>108 <label index="sa">Sanskrit</label>
108 <label index="sd">Sindhi</label>109 <label index="sd">Sindhi</label>
109 <label index="sg">Sangho</label>110 <label index="sg">Sango</label>
110 <label index="sh">Serbo-Croatian</label>111 <label index="sh">Serbo-Croatian</label>
111 <label index="si">Sinhalese</label>112 <label index="si">Sinhalese</label>
112 <label index="sk">Slovak</label>113 <label index="sk">Slovak</label>
@@ -116,8 +117,8 @@
116 <label index="so">Somali</label>117 <label index="so">Somali</label>
117 <label index="sq">Albanian</label>118 <label index="sq">Albanian</label>
118 <label index="sr">Serbian</label>119 <label index="sr">Serbian</label>
119 <label index="ss">Siswati</label>120 <label index="ss">Swati</label>
120 <label index="st">Sesotho</label>121 <label index="st">Southern Sotho</label>
121 <label index="su">Sundanese</label>122 <label index="su">Sundanese</label>
122 <label index="sv">Swedish</label>123 <label index="sv">Swedish</label>
123 <label index="sw">Swahili</label>124 <label index="sw">Swahili</label>
@@ -128,7 +129,7 @@
128 <label index="ti">Tigrinya</label>129 <label index="ti">Tigrinya</label>
129 <label index="tk">Turkmen</label>130 <label index="tk">Turkmen</label>
130 <label index="tl">Tagalog</label>131 <label index="tl">Tagalog</label>
131 <label index="tn">Setswana</label>132 <label index="tn">Tswana</label>
132 <label index="to">Tonga</label>133 <label index="to">Tonga</label>
133 <label index="tr">Turkish</label>134 <label index="tr">Turkish</label>
134 <label index="ts">Tsonga</label>135 <label index="ts">Tsonga</label>
@@ -139,7 +140,7 @@
139 <label index="ur">Urdu</label>140 <label index="ur">Urdu</label>
140 <label index="uz">Uzbek</label>141 <label index="uz">Uzbek</label>
141 <label index="vi">Vietnamese</label>142 <label index="vi">Vietnamese</label>
142 <label index="vo">Volapuk</label>143 <label index="vo">Volapük</label>
143 <label index="wo">Wolof</label>144 <label index="wo">Wolof</label>
144 <label index="xh">Xhosa</label>145 <label index="xh">Xhosa</label>
145 <label index="yi">Yiddish</label>146 <label index="yi">Yiddish</label>
146147
=== modified file 'dlf/lib/ISO-639/iso-639-2b.xml'
--- dlf/lib/ISO-639/iso-639-2b.xml 2012-03-20 14:11:28 +0000
+++ dlf/lib/ISO-639/iso-639-2b.xml 2012-05-15 07:32:27 +0000
@@ -53,7 +53,7 @@
53 <label index="bas">Basa</label>53 <label index="bas">Basa</label>
54 <label index="bat">Baltic languages</label>54 <label index="bat">Baltic languages</label>
55 <label index="bej">Beja, Bedawiyet</label>55 <label index="bej">Beja, Bedawiyet</label>
56 <label index="bel">Belarusian</label>56 <label index="bel">Byelorussian</label>
57 <label index="bem">Bemba</label>57 <label index="bem">Bemba</label>
58 <label index="ben">Bengali</label>58 <label index="ben">Bengali</label>
59 <label index="ber">Berber languages</label>59 <label index="ber">Berber languages</label>
@@ -121,7 +121,7 @@
121 <label index="dsb">Lower Sorbian</label>121 <label index="dsb">Lower Sorbian</label>
122 <label index="dua">Duala</label>122 <label index="dua">Duala</label>
123 <label index="dum">Middle Dutch (ca.1050-1350)</label>123 <label index="dum">Middle Dutch (ca.1050-1350)</label>
124 <label index="dut">Dutch, Flemish</label>124 <label index="dut">Dutch</label>
125 <label index="dyu">Dyula</label>125 <label index="dyu">Dyula</label>
126 <label index="dzo">Dzongkha</label>126 <label index="dzo">Dzongkha</label>
127 <label index="efi">Efik</label>127 <label index="efi">Efik</label>
@@ -204,11 +204,12 @@
204 <label index="ind">Indonesian</label>204 <label index="ind">Indonesian</label>
205 <label index="ine">Indo-European languages</label>205 <label index="ine">Indo-European languages</label>
206 <label index="inh">Ingush</label>206 <label index="inh">Ingush</label>
207 <label index="ipk">Inupiaq</label>207 <label index="ipk">Inupiak</label>
208 <label index="ira">Iranian languages</label>208 <label index="ira">Iranian languages</label>
209 <label index="iro">Iroquoian languages</label>209 <label index="iro">Iroquoian languages</label>
210 <label index="ita">Italian</label>210 <label index="ita">Italian</label>
211 <label index="jav">Javanese</label>211 <label index="jav">Javanese</label>
212 <label index="jaw">Javanese</label>
212 <label index="jbo">Lojban</label>213 <label index="jbo">Lojban</label>
213 <label index="jpn">Japanese</label>214 <label index="jpn">Japanese</label>
214 <label index="jpr">Judeo-Persian</label>215 <label index="jpr">Judeo-Persian</label>
@@ -227,7 +228,7 @@
227 <label index="kbd">Kabardian</label>228 <label index="kbd">Kabardian</label>
228 <label index="kha">Khasi</label>229 <label index="kha">Khasi</label>
229 <label index="khi">Khoisan languages</label>230 <label index="khi">Khoisan languages</label>
230 <label index="khm">Central Khmer</label>231 <label index="khm">Khmer</label>
231 <label index="kho">Khotanese, Sakan</label>232 <label index="kho">Khotanese, Sakan</label>
232 <label index="kik">Kikuyu, Gikuyu</label>233 <label index="kik">Kikuyu, Gikuyu</label>
233 <label index="kin">Kinyarwanda</label>234 <label index="kin">Kinyarwanda</label>
@@ -294,6 +295,7 @@
294 <label index="mni">Manipuri</label>295 <label index="mni">Manipuri</label>
295 <label index="mno">Manobo languages</label>296 <label index="mno">Manobo languages</label>
296 <label index="moh">Mohawk</label>297 <label index="moh">Mohawk</label>
298 <label index="mol">Moldavian</label>
297 <label index="mon">Mongolian</label>299 <label index="mon">Mongolian</label>
298 <label index="mos">Mossi</label>300 <label index="mos">Mossi</label>
299 <label index="mul">Multiple languages</label>301 <label index="mul">Multiple languages</label>
@@ -356,7 +358,7 @@
356 <label index="por">Portuguese</label>358 <label index="por">Portuguese</label>
357 <label index="pra">Prakrit languages</label>359 <label index="pra">Prakrit languages</label>
358 <label index="pro">Old Provençal (to 1500)</label>360 <label index="pro">Old Provençal (to 1500)</label>
359 <label index="pus">Pushto, Pashto</label>361 <label index="pus">Pushto</label>
360 <label index="que">Quechua</label>362 <label index="que">Quechua</label>
361 <label index="raj">Rajasthani</label>363 <label index="raj">Rajasthani</label>
362 <label index="rap">Rapanui</label>364 <label index="rap">Rapanui</label>
@@ -364,7 +366,7 @@
364 <label index="roa">Romance languages</label>366 <label index="roa">Romance languages</label>
365 <label index="roh">Romansh</label>367 <label index="roh">Romansh</label>
366 <label index="rom">Romany</label>368 <label index="rom">Romany</label>
367 <label index="rum">Romanian, Moldavian, Moldovan</label>369 <label index="rum">Romanian, Moldavian</label>
368 <label index="run">Rundi</label>370 <label index="run">Rundi</label>
369 <label index="rup">Aromanian, Arumanian, Macedo-Romanian</label>371 <label index="rup">Aromanian, Arumanian, Macedo-Romanian</label>
370 <label index="rus">Russian</label>372 <label index="rus">Russian</label>
@@ -385,7 +387,7 @@
385 <label index="sgn">Sign Languages</label>387 <label index="sgn">Sign Languages</label>
386 <label index="shn">Shan</label>388 <label index="shn">Shan</label>
387 <label index="sid">Sidamo</label>389 <label index="sid">Sidamo</label>
388 <label index="sin">Sinhala, Sinhalese</label>390 <label index="sin">Sinhalese</label>
389 <label index="sio">Siouan languages</label>391 <label index="sio">Siouan languages</label>
390 <label index="sit">Sino-Tibetan languages</label>392 <label index="sit">Sino-Tibetan languages</label>
391 <label index="sla">Slavic languages</label>393 <label index="sla">Slavic languages</label>
@@ -484,7 +486,7 @@
484 <label index="zap">Zapotec</label>486 <label index="zap">Zapotec</label>
485 <label index="zbl">Blissymbolics</label>487 <label index="zbl">Blissymbolics</label>
486 <label index="zen">Zenaga</label>488 <label index="zen">Zenaga</label>
487 <label index="zha">Zhuang, Chuang</label>489 <label index="zha">Zhuang</label>
488 <label index="znd">Zande languages</label>490 <label index="znd">Zande languages</label>
489 <label index="zul">Zulu</label>491 <label index="zul">Zulu</label>
490 <label index="zun">Zuni</label>492 <label index="zun">Zuni</label>
@@ -780,6 +782,7 @@
780 <label index="mni">Meithei-Sprache</label>782 <label index="mni">Meithei-Sprache</label>
781 <label index="mno">Manobo-Sprachen</label>783 <label index="mno">Manobo-Sprachen</label>
782 <label index="moh">Mohawk-Sprache</label>784 <label index="moh">Mohawk-Sprache</label>
785 <label index="mol">Moldavisch</label>
783 <label index="mon">Mongolisch</label>786 <label index="mon">Mongolisch</label>
784 <label index="mos">Mossi-Sprache</label>787 <label index="mos">Mossi-Sprache</label>
785 <label index="mul">Mehrere Sprachen</label>788 <label index="mul">Mehrere Sprachen</label>
786789
=== modified file 'dlf/modules/newclient/locallang.xml'
--- dlf/modules/newclient/locallang.xml 2012-04-30 16:05:21 +0000
+++ dlf/modules/newclient/locallang.xml 2012-05-15 07:32:27 +0000
@@ -104,6 +104,7 @@
104 <label index="volume">Volume</label>104 <label index="volume">Volume</label>
105 <label index="collection">Collection(s)</label>105 <label index="collection">Collection(s)</label>
106 <label index="owner">Owner</label>106 <label index="owner">Owner</label>
107 <label index="language">Language</label>
107 </languageKey>108 </languageKey>
108 <languageKey index="de" type="array">109 <languageKey index="de" type="array">
109 <label index="title">Neuer Mandant</label>110 <label index="title">Neuer Mandant</label>
@@ -204,6 +205,7 @@
204 <label index="volume">Band</label>205 <label index="volume">Band</label>
205 <label index="collection">Sammlung(en)</label>206 <label index="collection">Sammlung(en)</label>
206 <label index="owner">Besitzer</label>207 <label index="owner">Besitzer</label>
208 <label index="language">Sprache</label>
207 </languageKey>209 </languageKey>
208 </data>210 </data>
209</T3locallang>211</T3locallang>
210\ No newline at end of file212\ No newline at end of file
211213
=== modified file 'dlf/modules/newclient/metadata.inc.php'
--- dlf/modules/newclient/metadata.inc.php 2012-04-30 16:05:21 +0000
+++ dlf/modules/newclient/metadata.inc.php 2012-05-15 07:32:27 +0000
@@ -138,6 +138,20 @@
138 'is_facet' => 1,138 'is_facet' => 1,
139 'is_listed' => 0,139 'is_listed' => 0,
140 ),140 ),
141 'language' => array (
142 'encoded' => 1,
143 'xpath' => './mods:language/mods:languageTerm',
144 'xpath_sorting' => '',
145 'default_value' => '',
146 'wrap' => '',
147 'tokenized' => 0,
148 'stored' => 0,
149 'indexed' => 1,
150 'boost' => 1.00,
151 'is_sortable' => 0,
152 'is_facet' => 1,
153 'is_listed' => 0,
154 ),
141 'year' => array (155 'year' => array (
142 'encoded' => 1,156 'encoded' => 1,
143 'xpath' => '',157 'xpath' => '',
@@ -221,7 +235,7 @@
221 'is_sortable' => 1,235 'is_sortable' => 1,
222 'is_facet' => 1,236 'is_facet' => 1,
223 'is_listed' => 1,237 'is_listed' => 1,
224 ),238 )
225);239);
226240
227?>241?>
228\ No newline at end of file242\ No newline at end of file
229243
=== modified file 'dlf/plugins/collection/class.tx_dlf_collection.php'
--- dlf/plugins/collection/class.tx_dlf_collection.php 2012-05-07 09:52:15 +0000
+++ dlf/plugins/collection/class.tx_dlf_collection.php 2012-05-15 07:32:27 +0000
@@ -274,7 +274,7 @@
274 if (empty($_metadata)) {274 if (empty($_metadata)) {
275275
276 $_metadata = array (276 $_metadata = array (
277 'label' => $resArray['collLabel'],277 'label' => htmlspecialchars($resArray['collLabel']),
278 'description' => $this->pi_RTEcssText($resArray['collDesc']),278 'description' => $this->pi_RTEcssText($resArray['collDesc']),
279 'options' => array (279 'options' => array (
280 'source' => 'collection',280 'source' => 'collection',
281281
=== modified file 'dlf/plugins/listview/class.tx_dlf_listview.php'
--- dlf/plugins/listview/class.tx_dlf_listview.php 2012-05-05 16:30:51 +0000
+++ dlf/plugins/listview/class.tx_dlf_listview.php 2012-05-15 07:32:27 +0000
@@ -440,7 +440,7 @@
440440
441 }441 }
442442
443 $markerArray['###LISTTITLE###'] = htmlspecialchars($this->list->metadata['label']);443 $markerArray['###LISTTITLE###'] = $this->list->metadata['label'];
444444
445 $markerArray['###LISTDESCRIPTION###'] = $this->list->metadata['description'];445 $markerArray['###LISTDESCRIPTION###'] = $this->list->metadata['description'];
446446
447447
=== modified file 'dlf/plugins/search/class.tx_dlf_search.php'
--- dlf/plugins/search/class.tx_dlf_search.php 2012-03-30 09:14:14 +0000
+++ dlf/plugins/search/class.tx_dlf_search.php 2012-05-15 07:32:27 +0000
@@ -78,13 +78,24 @@
7878
79 }79 }
8080
81 // Set last query if applicable.
82 $lastQuery = '';
83
84 $_list = t3lib_div::makeInstance('tx_dlf_list');
85
86 if (!empty($_list->metadata['options']['source']) && $_list->metadata['options']['source'] == 'search') {
87
88 $lastQuery = $_list->metadata['options']['select'];
89
90 }
91
81 // Fill markers.92 // Fill markers.
82 $markerArray = array (93 $markerArray = array (
83 '###ACTION_URL###' => $this->pi_getPageLink($GLOBALS['TSFE']->id),94 '###ACTION_URL###' => $this->pi_getPageLink($GLOBALS['TSFE']->id),
84 '###LABEL_QUERY###' => $this->pi_getLL('label.query'),95 '###LABEL_QUERY###' => $this->pi_getLL('label.query'),
85 '###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),96 '###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
86 '###FIELD_QUERY###' => $this->prefixId.'[query]',97 '###FIELD_QUERY###' => $this->prefixId.'[query]',
87 '###QUERY###' => '',98 '###QUERY###' => htmlspecialchars($lastQuery),
88 );99 );
89100
90 // Display search form.101 // Display search form.
@@ -103,8 +114,8 @@
103114
104 // Set metadata for search.115 // Set metadata for search.
105 $_metadata = array (116 $_metadata = array (
106 'label' => sprintf($this->pi_getLL('searchfor', ''), $this->piVars['query']),117 'label' => htmlspecialchars(sprintf($this->pi_getLL('searchfor', ''), $this->piVars['query'])),
107 'description' => sprintf($this->pi_getLL('hits', ''), $numHits),118 'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $numHits)).'</p>',
108 'options' => array (119 'options' => array (
109 'source' => 'search',120 'source' => 'search',
110 'select' => $this->piVars['query'],121 'select' => $this->piVars['query'],

Subscribers

People subscribed via source and target branches

to all changes: