/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 35773

Added by Claudio Atzori over 9 years ago

reverted to r35450

     			// metadata.setNationality(getSimpleQualifier("UNKNOWN", "dnet:countries"));
     			final List<StructuredProperty> pids = Lists.newArrayList(getStructuredProperty(originalId, "oai", "oai", "dnet:pid_types", "dnet:pid_types"));
     			final OafEntity.Builder entity =
     					getEntity(Type.person, entityId, getKV(collectedFromId, collectedFromName), originalId, dateOfCollection, pids)
     							.setPerson(person.setMetadata(metadata));
     			final OafEntity.Builder entity = getEntity(Type.person, entityId, getKV(collectedFromId, collectedFromName), originalId, dateOfCollection, pids)
     					.setPerson(person.setMetadata(metadata));
     			return base64(getOaf(entity, getDataInfo(dataInfo, provenanceAction, trust, false, false)).toByteArray());
     		} catch (final Throwable e) {
-...
     			pids.addAll(parsePids(nodelist));
     			pids.add(getStructuredProperty(originalId, "oai", getClassName("oai"), "dnet:pid_types", "dnet:pid_types"));
     			final OafEntity.Builder entity =
     					getEntity(Type.result, entityId, getKV(collectedFromId, collectedFromName), originalId, dateOfCollection, pids)
     			final OafEntity.Builder entity = getEntity(Type.result, entityId, getKV(collectedFromId, collectedFromName), originalId, dateOfCollection, pids)
     					.setResult(result.setMetadata(metadata));
     			final Oaf oaf = getOaf(entity, getDataInfo(dataInfo, provenanceAction, trust, false, false));

     import org.apache.commons.codec.binary.Base64;
     import org.apache.commons.codec.binary.Hex;
     import org.apache.commons.lang.StringEscapeUtils;
     import org.apache.commons.lang.StringUtils;
     import org.apache.commons.lang.math.NumberUtils;
     import org.w3c.dom.NamedNodeMap;
-...
+    	}
     	protected static KeyValue getKV(final String id, final String name) {
     		return KeyValue.newBuilder().setKey(id).setValue(escapeXml(name)).build();
     		return KeyValue.newBuilder().setKey(id).setValue(name).build();
+    	}
     	protected static OafRel.Builder getRel(final String sourceId,
-...
     			final String originalId,
     			final String dateOfCollection,
     			final List<StructuredProperty> pids) {
     		final OafEntity.Builder builder = OafEntity.newBuilder().setType(type).setId(id).addCollectedfrom(collectedFrom).addOriginalId(originalId)
     		OafEntity.Builder builder = OafEntity.newBuilder().setType(type).setId(id).addCollectedfrom(collectedFrom).addOriginalId(originalId)
     				.setDateofcollection(dateOfCollection);
     		if ((pids != null) && !pids.isEmpty()) {
-...
     			final boolean deletedbyinference,
     			final boolean inferred) {
     		final DataInfo.Builder dataInfoBuilder = DataInfo.newBuilder();
     		DataInfo.Builder dataInfoBuilder = DataInfo.newBuilder();
     		dataInfoBuilder.setInferred(Boolean.valueOf(inferred));
     		dataInfoBuilder.setDeletedbyinference(Boolean.valueOf(deletedbyinference));
     		dataInfoBuilder.setTrust(trust);
-...
     		// checking instanceof because when receiving an empty <oaf:datainfo> we don't want to parse it.
     		if (((dataInfo != null) && (dataInfo.getLength() > 0)) /* && (dataInfo instanceof org.w3c.dom.Element) */) {
     			final org.w3c.dom.Element e = (org.w3c.dom.Element) dataInfo.item(0);
     			org.w3c.dom.Element e = (org.w3c.dom.Element) dataInfo.item(0);
     			org.w3c.dom.Element elem = getDirectChild(e, "inferred");
     			dataInfoBuilder.setInferred(Boolean.valueOf(elem != null ? elem.getTextContent() : String.valueOf(inferred)));
-...
     			dataInfoBuilder.setInferenceprovenance(elem != null ? elem.getTextContent() : "");
     			elem = getDirectChild(e, "provenanceaction");
     			final Qualifier.Builder pBuilder = Qualifier.newBuilder();
     			Qualifier.Builder pBuilder = Qualifier.newBuilder();
     			if (elem.hasAttributes()) {
     				final NamedNodeMap attributes = elem.getAttributes();
     				NamedNodeMap attributes = elem.getAttributes();
     				pBuilder.setClassid(attributes.getNamedItem("classid").getNodeValue());
     				pBuilder.setClassname(attributes.getNamedItem("classname").getNodeValue());
     				pBuilder.setSchemeid(attributes.getNamedItem("schemeid").getNodeValue());
-...
     			final String classid,
     			final String schemeid) {
     		if (values != null) {
     			for (final String s : values) {
     			for (String s : values) {
     				addField(builder, fd, getStructuredProperty(s, classid, classid, schemeid, schemeid));
+    			}
+    		}
-...
     				final Node pidType = node.getAttributes().getNamedItem("identifierType");
     				for (int j = 0; j < node.getChildNodes().getLength(); j++) {
     					final Node child = node.getChildNodes().item(j);
     					Node child = node.getChildNodes().item(j);
     					if ((child.getNodeType() == Node.TEXT_NODE) && (pidType != null) && (pidType.getNodeValue() != null) && !pidType.getNodeValue().isEmpty()
     							&& !pidType.getNodeValue().equalsIgnoreCase("url")) {
     						final String type = pidType.getNodeValue().toLowerCase();
     						String type = pidType.getNodeValue().toLowerCase();
     						final String value = child.getTextContent();
     						String value = child.getTextContent();
     						pids.add(getStructuredProperty(value, type, getClassName(type), "dnet:pid_types", "dnet:pid_types"));
     						break;
-...
     		if (value == null) return;
     		if (value instanceof List<?>) {
     			for (final Object o : (List<Object>) value) {
     			for (Object o : (List<Object>) value) {
     				addField(builder, descriptor, o);
+    			}
     		} else {
-...
     				fieldValue = Integer.valueOf(value.toString());
     				break;
     			case MESSAGE:
     				final Builder q = builder.newBuilderForField(descriptor);
     				Builder q = builder.newBuilderForField(descriptor);
     				if (value instanceof Builder) {
     					value = ((Builder) value).build();
     					final byte[] b = ((Message) value).toByteArray();
     					byte[] b = ((Message) value).toByteArray();
     					try {
     						q.mergeFrom(b);
     					} catch (final InvalidProtocolBufferException e) {
     					} catch (InvalidProtocolBufferException e) {
     						throw new IllegalArgumentException("Unable to merge value: " + value + " with builder: " + q.getDescriptorForType().getName());
+    					}
     				} else if (Qualifier.getDescriptor().getName().equals(q.getDescriptorForType().getName())) {
     					if (value instanceof Qualifier) {
     						q.mergeFrom((Qualifier) value);
     					} else {
     						parseMessage(q, Qualifier.getDescriptor(), escapeXml(value.toString()), "@@@");
     						parseMessage(q, Qualifier.getDescriptor(), value.toString(), "@@@");
+    					}
     				} else if (StructuredProperty.getDescriptor().getName().equals(q.getDescriptorForType().getName())) {
     					if (value instanceof StructuredProperty) {
-...
+    	}
     	protected static void parseMessage(final Builder builder, final Descriptor descriptor, final String value, final String split) {
     		final IterablePair<FieldDescriptor, String> iterablePair =
     				new IterablePair<FieldDescriptor, String>(descriptor.getFields(), Lists.newArrayList(Splitter
     						.on(split).trimResults().split(value)));
     		IterablePair<FieldDescriptor, String> iterablePair = new IterablePair<FieldDescriptor, String>(descriptor.getFields(), Lists.newArrayList(Splitter
     				.on(split).trimResults().split(value)));
     		for (final Pair<FieldDescriptor, String> p : iterablePair) {
     		for (Pair<FieldDescriptor, String> p : iterablePair) {
     			addField(builder, p.getKey(), p.getValue());
+    		}
+    	}
-...
+    	}
     	protected static Qualifier.Builder getDefaultQualifier(final String scheme) {
     		final Qualifier.Builder qualifier = Qualifier.newBuilder().setSchemeid(scheme).setSchemename(scheme);
     		Qualifier.Builder qualifier = Qualifier.newBuilder().setSchemeid(scheme).setSchemename(scheme);
     		return qualifier;
+    	}
-...
     			final String schemeid,
     			final String schemename) {
     		if ((value == null) || value.isEmpty()) return null;
     		return StructuredProperty.newBuilder().setValue(escapeXml(value)).setQualifier(getQualifier(classid, classname, schemeid, schemename)).build();
     		return StructuredProperty.newBuilder().setValue(value).setQualifier(getQualifier(classid, classname, schemeid, schemename)).build();
+    	}
     	protected static StringField.Builder sf(final String s) {
     		return StringField.newBuilder().setValue(escapeXml(s));
     		return StringField.newBuilder().setValue(s);
+    	}
     	public static String generateNsPrefix(final String prefix, final String externalId) {
-...
     	public static String md5(final String s) {
     		try {
     			final MessageDigest md = MessageDigest.getInstance("MD5");
     			MessageDigest md = MessageDigest.getInstance("MD5");
     			md.update(s.getBytes("UTF-8"));
     			return new String(Hex.encodeHex(md.digest()));
     		} catch (final Exception e) {
     		} catch (Exception e) {
     			System.err.println("Error creating id");
     			return null;
+    		}
-...
     		return oafId(entityType, StringUtils.substringBefore(fullId, "::"), StringUtils.substringAfter(fullId, "::"));
+    	}
     	public static String escapeXml(final String s) {
     		return StringEscapeUtils.escapeXml(s);
+    	}
     	/**
     	 * Gets the classname of the given class code
+    	 *
+    	 *
     	 * @param code
     	 *            class code.
     	 * @return the class name, if the code is a key of the map. The code itself otherwise.
     	 */
     	public static String getClassName(final String code) {
     		final String classname = code2name.get(code);
     		String classname = code2name.get(code);
     		if (StringUtils.isBlank(classname)) return code;
     		return classname;
+    	}

     	<groupId>eu.dnetlib</groupId>
     	<artifactId>dnet-openaireplus-mapping-utils</artifactId>
     	<packaging>jar</packaging>
     	<version>3.0.2-SNAPSHOT</version>
     	<version>3.0.1-SNAPSHOT</version>
     	<scm>
     		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-openaireplus-mapping-utils/trunk</developerConnection>
     	</scm>

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 35773

Added by Claudio Atzori over 9 years ago