gCubeSystem
/
gcubedatacatalogue-metadata-discovery
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed QName for Metafata Field 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@146471 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2017-03-31 09:28:32 +00:00
parent a6ae1f4bab
commit 83d0640800
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataField.java
View File

@ -127,7 +127,18 @@ public class MetadataField implements Serializable{
*/ */
public String getNamespaceFieldToCategoryReference() { public String getNamespaceFieldToCategoryReference() {
initNamespaceFieldToCategoryReference();
return namespaceFieldToCategoryReference; return namespaceFieldToCategoryReference;
}
/**
* Inits the namespace field to category reference.
*/
private void initNamespaceFieldToCategoryReference(){
if(namespaceFieldToCategoryReference==null && categoryRef!=null && !categoryRef.isEmpty())
setNamespaceFieldToCategoryRef();
} }
@ -142,6 +153,7 @@ public class MetadataField implements Serializable{
*/ */
public String getCategoryFieldQName(){ public String getCategoryFieldQName(){
initNamespaceFieldToCategoryReference();
return namespaceFieldToCategoryReference==null?fieldName:namespaceFieldToCategoryReference+MetadataNamespace.Separator+fieldName; return namespaceFieldToCategoryReference==null?fieldName:namespaceFieldToCategoryReference+MetadataNamespace.Separator+fieldName;
} }

3
src/main/java/org/gcube/datacatalogue/metadatadiscovery/reader/MetadataFormatReader.java
View File

@ -164,6 +164,7 @@ public class MetadataFormatReader {
InputStream stream = new ByteArrayInputStream(metadataFormatSource.get(0).getBytes()); InputStream stream = new ByteArrayInputStream(metadataFormatSource.get(0).getBytes());
MetadataFormat mtdf = (MetadataFormat) jaxbUnmarshaller.unmarshal(stream); MetadataFormat mtdf = (MetadataFormat) jaxbUnmarshaller.unmarshal(stream);
logger.debug("returning metadata format with medata type: "+mtdf.getMetadataType()); logger.debug("returning metadata format with medata type: "+mtdf.getMetadataType());
return mtdf; return mtdf;
}catch(Exception e){ }catch(Exception e){
@ -172,6 +173,8 @@ public class MetadataFormatReader {
} }
} }
/** /**
* Gets the metadata fields from resource. * Gets the metadata fields from resource.
* *

23
src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
View File

@ -137,19 +137,24 @@ public class TestJaxbMetadataMarshUnmarsh {
System.out.println("Metadata Format"); System.out.println("Metadata Format");
System.out.println(mtds); System.out.println(mtds);
System.out.println("Metadata Categories"); // System.out.println("Metadata Categories");
if(mtds.getMetadataCategories()!=null){ // if(mtds.getMetadataCategories()!=null){
for (MetadataCategory cat : mtds.getMetadataCategories()) { // for (MetadataCategory cat : mtds.getMetadataCategories()) {
System.out.println(cat); // System.out.println(cat);
System.out.println(cat.getCategoryQName()); // System.out.println(cat.getCategoryQName());
} // }
} // }
System.out.println("\n\nMetadata Fields"); System.out.println("\n\nMetadata Fields");
for (MetadataField field : mtds.getMetadataFields()) { for (MetadataField field : mtds.getMetadataFields()) {
System.out.println(field); System.out.println(field);
System.out.println(field.getGrouping()); System.out.println("Category Ref: "+field.getCategoryRef());
System.out.println(field.getTagging()); System.out.println("Category Namespace: "+field.getNamespaceFieldToCategoryReference());
System.out.println("Category CategoryField Q Name: "+field.getCategoryFieldQName());
System.out.println("QName: "+field.getCategoryFieldQName());
// System.out.println(field.getGrouping());
// System.out.println(field.getTagging());
} }
} }