litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-936 code change to keep local name intact for change namespace utility

Browse source
This commit is contained in:
ass92 2010-07-22 16:53:54 +00:00
parent 4b990e4649
commit 035c4c3735
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
View file

@ -15,6 +15,8 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -1073,7 +1075,7 @@ public class JenaIngestController extends BaseEditController {
return result; return result;
} }
private String doRename(String uri1,String uri2,HttpServletResponse response){ private String doRename(String oldNamespace,String newNamespace,HttpServletResponse response){
String userURI = null; String userURI = null;
String uri = null; String uri = null;
@ -1097,7 +1099,7 @@ private String doRename(String uri1,String uri2,HttpServletResponse response){
Individual ind = indIter.next(); Individual ind = indIter.next();
String namespace = ind.getNameSpace(); String namespace = ind.getNameSpace();
if( namespace != null ){ if( namespace != null ){
if( uri1.equals(namespace) ){ if( oldNamespace.equals(namespace) ){
uri = ind.getURI(); uri = ind.getURI();
urisToChange.add(uri); urisToChange.add(uri);
namespacePresent = true; namespacePresent = true;
@ -1123,7 +1125,10 @@ private String doRename(String uri1,String uri2,HttpServletResponse response){
Resource infRes = infOntModel.getResource(oldURIStr); Resource infRes = infOntModel.getResource(oldURIStr);
long time2 = System.currentTimeMillis(); long time2 = System.currentTimeMillis();
String newURIStr=null; String newURIStr=null;
newURIStr = getUnusedURI(uri2); Pattern p = Pattern.compile(oldNamespace);
String candidateString = res.getURI();
Matcher matcher = p.matcher(candidateString);
newURIStr = matcher.replaceFirst(newNamespace);
long time3 = System.currentTimeMillis(); long time3 = System.currentTimeMillis();
System.out.println("time to get new uri: " + Long.toString(time3 - time2) System.out.println("time to get new uri: " + Long.toString(time3 - time2)
); );