Update source field for rs in DBS data and fix digits bug (#90)

Resolves #90 See http://beta.lobid.org/organisations/search?q=dbsID:*+AND+rs:*
hbz · Mar 9, 2016 · 46b8ee5 · 46b8ee5
1 parent e3f6e06
commit 46b8ee5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/flow/Constants.java b/src/main/java/flow/Constants.java
@@ -35,7 +35,7 @@ public class Constants {
 
 	// ELASTICSEARCH SETTINGS
 	protected static final String ES_CLUSTER = "lobid-hbz";
-	protected static final String ES_INDEX = "organisations-staging";
+	protected static final String ES_INDEX = "organisations";
 	protected static final String ES_TYPE = "organisation";
 	protected static final String SERVER_NAME = "quaoar1.hbz-nrw.de";
 

diff --git a/src/main/resources/morph-enriched.xml b/src/main/resources/morph-enriched.xml
@@ -18,12 +18,12 @@
 			</choose>
 		</combine>
 		<choose>
-			<data source="gemeindekennzahl" name="rs">
-				<regexp match="(\d{11})" format="0${1}"/>
-			</data>
-			<data source="gemeindekennzahl" name="rs">
+			<data source="stk_2007" name="rs">
 				<regexp match="\d{12}" />
 			</data>
+			<data source="stk_2007" name="rs">
+				<regexp match="(\d{11})" format="0${1}"/>
+			</data>
 			<data source="032P.n" name="rs">
 				<lookup in="rs_map" />
 			</data>

diff --git a/src/test/resources/test_morph-enriched.xml b/src/test/resources/test_morph-enriched.xml
@@ -21,11 +21,13 @@
 						<literal name="typ_text" value="Öffentliche Bibliothek" />
 						<literal name="utr_text" value="Land" />
 						<literal name="gro_text" value="1.000.001 und mehr" />
+						<literal name="stk_2007" value="10510011011" />
 					</record>
 					<record id="de-123">
 						<literal name="ema" value="some.one@example.com" />
 						<literal name="tvw" value="-221" />
 						<literal name="tel" value="123" />
+						<literal name="stk_2007" value="100460000000" />
 					</record>
 				</records>
 			</cgxml>
@@ -67,6 +69,7 @@
 					</record>
 					<record id="de-10">
 						<!--<literal name="inr" value="dbs-id" />-->
+						<literal name="rs" value="010510011011" />
 						<entity name="classification">
 							<literal name="id" value="http://purl.org/lobid/libtype#n33" />
 							<literal name="value" value="Öffentliche Bibliothek" />
@@ -85,6 +88,7 @@
 						<literal name="telephone" value="0221 123" />
 						<literal name="email" value="mailto:some.one@example.com" />
 						 -->
+						 <literal name="rs" value="100460000000" />
 					</record>
 				</records>
 			</cgxml>