fixed detail (+) and .q urls so they are based on the current request URL

patrickangeles · patrickangeles · commit 1bad4d37f378 · 2011-06-17T21:16:36.000-04:00
diff --git a/src/main/java/com/hbasebook/hush/HushUtil.java b/src/main/java/com/hbasebook/hush/HushUtil.java
@@ -119,4 +119,13 @@ public static String getOrSetUsername(HttpServletRequest request,
     }
     return username;
   }
+
+  public static String getBaseURL(HttpServletRequest request) {
+    String url = request.getRequestURI();
+    int slash = url.lastIndexOf('/');
+    if (slash < 0) {
+      slash = url.length();
+    }
+    return url.substring(0, slash);
+  }
 }
diff --git a/src/main/webapp/details.jsp b/src/main/webapp/details.jsp
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ page import="com.hbasebook.hush.ResourceManager" %>
 <%@ page import="com.hbasebook.hush.Counters" %>
+<%@ page import="com.hbasebook.hush.HushUtil" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.NavigableMap" %>
 <%@ page import="java.util.Calendar" %>
@@ -30,7 +31,7 @@
       forward(request, response);
   }
   SimpleDateFormat formatter = new SimpleDateFormat("yyyy, MM, dd");
-  String qrUrl = url.toString() + ".q";
+  String qrUrl = HushUtil.getBaseURL(request) + "/" + url.getId() + ".q";
   ShortUrl aggUrl = manager.getUrlManager().getShortUrl(url.getRefShortId());
 %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
diff --git a/src/main/webapp/include/userstats.jsp b/src/main/webapp/include/userstats.jsp
@@ -8,11 +8,7 @@
 <%
   String username = HushUtil.getOrSetUsername(request, response);
   ResourceManager rm = ResourceManager.getInstance();
-  String requestURI = request.getRequestURI() ;
-  int endIndex = requestURI.lastIndexOf('/');
-  if (endIndex < 0)
-    endIndex = requestURI.length();
-  String siteUrl = requestURI.substring(0, endIndex) ;
+  String siteUrl = HushUtil.getBaseURL (request);
   String site = rm.getDomainManager().getDefaultDomain();
   List<ShortUrlStatistics> stats = rm.getCounters().getUserShortUrlStatistics(
     username);

Original file line number	Diff line number	Diff line change
`@@ -119,4 +119,13 @@ public static String getOrSetUsername(HttpServletRequest request,`
`119`	`119`	`}`
`120`	`120`	`return username;`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+ public static String getBaseURL(HttpServletRequest request) {`
	`124`	`+ String url = request.getRequestURI();`
	`125`	`+ int slash = url.lastIndexOf('/');`
	`126`	`+ if (slash < 0) {`
	`127`	`+ slash = url.length();`
	`128`	`+ }`
	`129`	`+ return url.substring(0, slash);`
	`130`	`+ }`
`122`	`131`	`}`