|
From: <pe...@us...> - 2003-10-23 22:06:03
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id In directory sc8-pr-cvs1:/tmp/cvs-serv25582/src/java/org/neuclear/id Modified Files: NSTools.java Log Message: Moved some certificates to live status at http://repository.neuclear.org Updated NSTools.url2path to support neuids with @ signs. Index: NSTools.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/NSTools.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NSTools.java 22 Oct 2003 23:16:00 -0000 1.10 --- NSTools.java 23 Oct 2003 22:02:36 -0000 1.11 *************** *** 2,5 **** --- 2,9 ---- * $Id$ * $Log$ + * Revision 1.11 2003/10/23 22:02:36 pelle + * Moved some certificates to live status at http://repository.neuclear.org + * Updated NSTools.url2path to support neuids with @ signs. + * * Revision 1.10 2003/10/22 23:16:00 pelle * Cleaned up some unused stuff in NSTools *************** *** 218,221 **** --- 222,229 ---- public static String url2path(String name) { if (!Utility.isEmpty(name)) { + Matcher matcher = STRIP_URI_ARROBA.matcher(name); + if (matcher.matches()) { + return "/" + matcher.group(3) + "/@" + matcher.group(2) + Utility.denullString(matcher.group(4)); + } int loc = name.indexOf("://"); if (loc >= 0) *************** *** 239,242 **** --- 247,254 ---- private static final Pattern VALID = Pattern.compile(VALID_ID); + private static final String STRIP_URI_ARROBA_EX = "^(neu:\\/)?" + + "\\/(" + VALID_TOKEN + ")@(" + VALID_TOKEN + ")([\\/\\w.]*)$"; + + private static final Pattern STRIP_URI_ARROBA = Pattern.compile(STRIP_URI_ARROBA_EX); } |