From f0af16d76cff0624e9ec88b2725f410a9348bb57 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 9 Dec 2010 23:54:27 +0000
Subject: [PATCH] Adding XML search results NIHVIVO-1303.  Adding menu page
 browse NIHVIVO-632.

---
 .../dao/filtering/VClassGroupDaoFiltering.java |  6 ++++++
 .../webapp/dao/jena/VClassGroupDaoJena.java    | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
index dbbbb9b38..e96a61b0b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
@@ -106,4 +106,10 @@ public class VClassGroupDaoFiltering extends BaseFiltering implements VClassGrou
     }
 
 
+    @Override
+    public void removeClassesHiddenFromSearch(List<VClassGroup> groups) {
+        innerDao.removeClassesHiddenFromSearch(groups);        
+    }
+
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
index f13bba814..8edeb4d25 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
@@ -27,6 +27,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
+import edu.cornell.mannlib.vitro.webapp.web.DisplayVocabulary;
 
 public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
 
@@ -286,4 +288,20 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
         }
     }
 
+    @Override
+    public void removeClassesHiddenFromSearch(List<VClassGroup> groups) {        
+        OntModel displayOntModel = getOntModelSelector().getDisplayModel();
+        ProhibitedFromSearch pfs = new ProhibitedFromSearch(
+                DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel);
+        for (VClassGroup group : groups) {
+            List<VClass> classList = new ArrayList<VClass>();
+            for (VClass vclass : group.getVitroClassList()) {
+                if (!pfs.isClassProhibited(vclass.getURI())) {
+                    classList.add(vclass);
+                }
+            }
+            group.setVitroClassList(classList);
+        }        
+    }
+
 }