cvs commit: xml-xindice/java/src/org/apache/xindice/server UglyBrowser.java

[vgritsenko]

vgritsenko    2003/12/11 07:43:12

  Modified:    .        status.xml
               java/src/org/apache/xindice/server UglyBrowser.java
  Log:
  Fix bug 21765: Change URLs in debug tool to "/xindice/?/db".
  
  Revision  Changes    Path
  1.14      +3 -0      xml-xindice/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-xindice/status.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- status.xml        11 Dec 2003 15:35:20 -0000      1.13
  +++ status.xml        11 Dec 2003 15:43:12 -0000      1.14
  @@ -60,6 +60,9 @@
       <changes>
           <!-- Add new releases here -->
           <release version="1.1-dev" date="September 4 2003">
  +            <action dev="VG" type="fix" fixes-bug="21765">
  +                Change URLs in debug tool to "/xindice/?/db".
  +            </action>
               <action dev="VG" type="fix" fixes-bug="14846">
                   Drop SysSymbols when deleting collection.
               </action>
  
  
  
  1.10      +6 -6      
xml-xindice/java/src/org/apache/xindice/server/UglyBrowser.java
  
  Index: UglyBrowser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/UglyBrowser.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- UglyBrowser.java  9 Aug 2003 21:19:53 -0000       1.9
  +++ UglyBrowser.java  11 Dec 2003 15:43:12 -0000      1.10
  @@ -101,7 +101,7 @@
               if (path == null) {
                   sb.append("<h2>THIS IS AN UGLY DEBUG TOOL!</h2><p>");
                   sb.append("To browse the database, follow the link ");
  -                sb.append("<a href=\"" + contextPath + "?/" + db.getName() + 
"\">" + db.getName() + "</a>");
  +                sb.append("<a href=\"" + contextPath + "/?/" + db.getName() 
+ "\">" + db.getName() + "</a>");
               } else {
                   // we have something to chew on
                   XPathPseudoParser parser = new XPathPseudoParser(path);
  @@ -135,7 +135,7 @@
           String path = parser.getQuery();
           StringBuffer result = new StringBuffer();
           StringTokenizer st = new StringTokenizer(path, "/");
  -        String currentPath = "<a href=\"" + contextPath + "?";
  +        String currentPath = "<a href=\"" + contextPath + "/?";
           while (st.hasMoreTokens()) {
               String token = st.nextToken();
               if (token.indexOf("&") > 0) {
  @@ -169,7 +169,7 @@
           String dbLoc = parser.getDatabase();
           String parserPath = parser.getPath();
           StringBuffer baseHref = new StringBuffer();
  -        baseHref.append("<a href=\"" + contextPath + "?" + dbLoc);
  +        baseHref.append("<a href=\"" + contextPath + "/?" + dbLoc);
           if(parserPath.startsWith("/") || dbLoc.endsWith("/")) {
               baseHref.append(parserPath);
           } else {