Merge branch 'master' of ssh://[email protected]/culturegraph/metafacture-core.git

Author: mgeipel

.travis.yml

@@ -10,5 +10,4 @@ env:
 
 
 after_success:
-  - python travis-ci/configure-mvn.py
-  - mvn clean deploy --settings ~/.m2/mySettings.xml -Dgpg.skip=true -Psonatype-oss-release
+  - "[[ $TRAVIS_BRANCH == \"master\" ]] && { python travis-ci/configure-mvn.py ; mvn clean deploy --settings ~/.m2/mySettings.xml -Dgpg.skip=true -Psonatype-oss-release ; }"

src/main/java/org/culturegraph/mf/framework/StreamReceiver.java

@@ -25,7 +25,7 @@
  * ENTITY_OR_LITERAL = ENTITY | literal
  * ENTITY = startEntity, ENTITY_OR_LITERAL*, endEntity)
  * 
- * The {@link WellFormednessChecker} can be used to check if a stream conforms 
+ * The {@link WellformednessChecker} can be used to check if a stream conforms 
  * to these rules.
  * 
  * @see DefaultStreamReceiver

src/main/java/org/culturegraph/mf/stream/converter/MapToStream.java

@@ -24,32 +24,32 @@
 
 /**
  * Creates a literal for each entry in a map.
- * 
+ *
  * @author Christoph Böhme
  */
 public final class MapToStream extends
 		DefaultObjectPipe<Map<?, ?>, StreamReceiver> {
 
-	
+
 	private Object idKey = StreamConstants.ID;
-	
+
 	public Object getIdKey() {
 		return idKey;
 	}
-	
+
 	public void setIdKey(final Object idKey) {
 		this.idKey = idKey;
 	}
-	
+
 	@Override
 	public void process(final Map<?, ?> map) {
 		final Object id = map.get(idKey);
 		if (id == null) {
-			getReceiver().startRecord(null);
+			getReceiver().startRecord("");
 		} else {
 			getReceiver().startRecord(id.toString());
 		}
-		for (Map.Entry<?, ?> entry: map.entrySet()) {
+		for (final Map.Entry<?, ?> entry: map.entrySet()) {
 			getReceiver().literal(entry.getKey().toString(), entry.getValue().toString());
 		}
 		getReceiver().endRecord();

src/main/java/org/culturegraph/mf/stream/converter/xml/CGXmlHandler.java

@@ -26,9 +26,9 @@
 
 /**
  * Reads CG-XML files.
- * 
+ *
  * @author Christoph Böhme
- * 
+ *
  */
 @Description("Reads CG-XML files")
 @In(XmlReceiver.class)
@@ -46,7 +46,12 @@ public final class CGXmlHandler extends DefaultXmlPipe<StreamReceiver> {
 	public void startElement(final String uri, final String localName,
 			final String qName, final Attributes attributes) {
 		if (RECORD_TAG.equals(localName)) {
-			getReceiver().startRecord(attributes.getValue("", ID_ATTR));
+			final String recordId = attributes.getValue("", ID_ATTR);
+			if (recordId == null) {
+				getReceiver().startRecord("");
+			} else {
+				getReceiver().startRecord(recordId);
+			}
 		} else if (ENTITY_TAG.equals(localName)) {
 			getReceiver().startEntity(attributes.getValue("", NAME_ATTR));
 		} else if (LITERAL_TAG.equals(localName)) {