update

matallen · Oct 8, 2019 · 461e8d0 · 461e8d0
1 parent af365f3
commit 461e8d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/com/redhat/sso/Controller2.java b/src/main/java/com/redhat/sso/Controller2.java
@@ -274,12 +274,14 @@ private List<Offering> aggregateIntoOfferings(List<Document> alldocuments, Strin
         	// get data from overview pages
 
         	int docTitlePosition=Math.max(overview.name.toLowerCase().indexOf("overview"), overview.name.toLowerCase().indexOf(" page"));
+        	boolean titleOnLeft=false;
           if (overview.name.lastIndexOf("-")>docTitlePosition){
           	o.offering=StrParse.get(overview.name).rightOf("-").trim();
           	overview.name=StrParse.get(overview.name).leftOf("-").trim();
           }else{
           	o.offering=StrParse.get(overview.name).leftOf("-").trim();
           	overview.name=StrParse.get(overview.name).rightOf("-").trim();
+          	titleOnLeft=true;
           }
 
 //          o.offering=StrParse.get(overview.name).rightOf("-").trim();
@@ -300,9 +302,6 @@ private List<Offering> aggregateIntoOfferings(List<Document> alldocuments, Strin
           o.related.addAll(extractSectionListToDocuments("<[Hh]\\d.*?>(.+?)</[Hh]\\d>", overview.description, new String[]{"RELATED SOLUTIONS:","Related Solutions:"}));
           o.related.addAll(extractSectionListToDocuments("<[Hh]\\d.*?>(.+?)</[Hh]\\d>", overview.description, new String[]{"RELATED OFFERINGS:","Related Offerings:"}));
 
-          //now, if the overview has a "Related Documents" section, then append those links too
-          o.documents.addAll(extractOtherDocuments2(overview, overview.description, new String[]{"OTHER MATERIALS:", "Other Materials:"}));
-
 //          overview.name=StrParse.get(overview.name).leftOf("-").trim();
           overview.description="";
 
@@ -318,14 +317,20 @@ private List<Offering> aggregateIntoOfferings(List<Document> alldocuments, Strin
           // find the related docs using the groupTag
           for (Document d:alldocuments){
           	if (d.tags.contains(groupTag)){
-          		d.name=StrParse.get(d.name).leftOf("-").trim();
+          		if (titleOnLeft){
+          			d.name=StrParse.get(d.name).rightOf("-").trim();
+          		}else
+          			d.name=StrParse.get(d.name).leftOf("-").trim();
           		d.description="";
           		log.debug("Overview ("+o.offering+"):: Adding (Mojo) document -> ("+d.id+")"+d.name);
           		o.documents.add(d);
           		remove.add(d);
           	}
           }
           alldocuments.removeAll(remove); remove.clear();
+
+          //now, if the overview has a "Related Documents" section, then append those links too
+          o.documents.addAll(extractOtherDocuments2(overview, overview.description, new String[]{"OTHER MATERIALS:", "Other Materials:"}));
         }
 
         log.debug("Overview ("+o.offering+") type="+o.type);

diff --git a/src/main/java/com/redhat/sso/InitServlet.java b/src/main/java/com/redhat/sso/InitServlet.java
@@ -8,7 +8,7 @@ public class InitServlet extends HttpServlet {
 
   @Override
   public void init(ServletConfig config) throws ServletException {
-    Heartbeat.start(120000l); // 2 mins
+    //Heartbeat.start(120000l); // 2 mins
     super.init(config);
   }