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 @@
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.
+ 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 @@ -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.
+ \ 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 @@ -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.
+ \ No newline at end of file