From 7d41fde0b349f4a9aca2a3b0a830a1d8cbb7b845 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Thu, 15 Jul 2010 18:12:15 +0000 Subject: [PATCH] adding some explanatory text to new ingest tools --- .../controller/jena/JenaIngestController.java | 4 ++-- webapp/web/jenaIngest/ingestMenu.jsp | 2 +- webapp/web/jenaIngest/listModels.jsp | 2 +- webapp/web/jenaIngest/mergeIndividuals.jsp | 21 ++++++++++++++++--- webapp/web/jenaIngest/permanentURI.jsp | 21 ++++++++++++++----- webapp/web/jenaIngest/renameResource.jsp | 12 +++++++++-- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index 347058538..861fe5632 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -1003,12 +1003,12 @@ public class JenaIngestController extends BaseEditController { } private String getUnusedURI(String newNamespace){ String uri = null; - Random random = new Random(); + Random random = new Random(Integer.MAX_VALUE); boolean resourcePresent=true; OntModel vitroJenaModel = (OntModel) getServletContext().getAttribute("baseOntModel"); Resource res = null; do{ - uri = newNamespace + "individual" + random.nextInt(); + uri = newNamespace + "n" + random.nextInt(); res = vitroJenaModel.getResource(uri); StmtIterator stmtItr1 = vitroJenaModel.listStatements(res,(Property)null,(RDFNode)null); if(!stmtItr1.hasNext()){ diff --git a/webapp/web/jenaIngest/ingestMenu.jsp b/webapp/web/jenaIngest/ingestMenu.jsp index 15a7b6d98..367c3753e 100644 --- a/webapp/web/jenaIngest/ingestMenu.jsp +++ b/webapp/web/jenaIngest/ingestMenu.jsp @@ -16,7 +16,7 @@
  • Split Property Value Strings into Multiple Property Values
  • Execute Workflow
  • Merge Individuals
    • -
  • Rename Resource
    • +
  • Change Namespace of Resources
    • diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp index 6c4fbb06b..d2ef19afd 100644 --- a/webapp/web/jenaIngest/listModels.jsp +++ b/webapp/web/jenaIngest/listModels.jsp @@ -84,7 +84,7 @@
    + name="submit" value="generate permanent URIs" />   diff --git a/webapp/web/jenaIngest/mergeIndividuals.jsp b/webapp/web/jenaIngest/mergeIndividuals.jsp index fc42ad097..6de9e1f31 100644 --- a/webapp/web/jenaIngest/mergeIndividuals.jsp +++ b/webapp/web/jenaIngest/mergeIndividuals.jsp @@ -20,10 +20,25 @@

    Ingest Home

    Merge Individuals

    + +

    This tool allows two individuals with different URIs to be collapsed into a + single URI. Any statements using the "duplicate individual URI" will be + rewritten using the "primary individual URI." If there are multiple + statements for a property that can have only a single value, the extra + statements will be retracted from the model and offered for download.

    +

    This tool operates on the main web application model only, not on any + of the additional Jena models.

    +
    -

    Individual URI1 

    -

    Individual URI2 

    -

    + + + + + + + +
    Primary individual URI
    Duplicate individual URI
    +

    diff --git a/webapp/web/jenaIngest/permanentURI.jsp b/webapp/web/jenaIngest/permanentURI.jsp index 1cdc5b6d8..c3aa9b2bd 100644 --- a/webapp/web/jenaIngest/permanentURI.jsp +++ b/webapp/web/jenaIngest/permanentURI.jsp @@ -17,12 +17,23 @@

    Ingest Home

    -

    Assign Permanent URI To Individuals

    +

    Assign Permanent URIs To Resources

    + +

    This tool will rename the resources in the selected model to with new +randomly-generated URIs following the pattern used in the main application. +The tool will generate URIs that are not already in use in the main web +application model. Statements using the newly-renamed resources will be +written to the "model to save."

    + +

    The permanent URIs may be generated in an arbitrary "new namespace for +resources." Otherwise, the "use default namespace" option will generate +URIs exactly of the form created through the GUI interface.

    +
    <%String modelName = (String)request.getAttribute("modelName"); %> -

    Namespace of resources <%List namespaces = (List)request.getAttribute("namespaceList"); if(namespaces != null){ Iterator namespaceItr = namespaces.iterator(); Integer count = 0; @@ -42,10 +53,10 @@ if(namespaces != null){ } %>

    -

    New Namespace for resources

    +

    New namespace for resources

    Or <%String defaultNamespace = (String)request.getAttribute("defaultNamespace");%> -

    Choose Default Namespace <%=defaultNamespace%> +

    Use default namespace <%=defaultNamespace%>

    -

    +

    \ No newline at end of file diff --git a/webapp/web/jenaIngest/renameResource.jsp b/webapp/web/jenaIngest/renameResource.jsp index dad726387..ffa18af87 100644 --- a/webapp/web/jenaIngest/renameResource.jsp +++ b/webapp/web/jenaIngest/renameResource.jsp @@ -12,10 +12,18 @@

    Ingest Home

    -

    Rename Resource

    +

    Change Namespace of Resources

    + +

    This tool will change all resources in the supplied "old namespace" +to be in the "new namespace." Additionally, the local names will be updated +to follow the established "n" + random integer naming convention.

    + +

    This tool operates on the main web application model only, not on any + of the additional Jena models.

    +

    Old Namespace 

    New Namespace 

    -

    +

    \ No newline at end of file