Merge branch 'feature-anotaciones-#43' of https://github.com/Reposito…

…rioNacionalCultura/Front into feature-anotaciones-#43
RepositorioNacionalCultura · Jun 7, 2018 · ef5eb75 · ef5eb75
2 parents 4103799 + d474ef2
commit ef5eb75
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 24 deletions.
diff --git a/Components/src/main/java/mx/gob/cultura/portal/resources/AnnotationsMgr.java b/Components/src/main/java/mx/gob/cultura/portal/resources/AnnotationsMgr.java
@@ -19,7 +19,9 @@
 import javax.servlet.http.HttpServletResponse;
 import mx.gob.cultura.portal.persist.AnnotationMgr;
 import mx.gob.cultura.portal.request.GetBICRequest;
+import mx.gob.cultura.portal.request.ListBICRequest;
 import mx.gob.cultura.portal.response.Annotation;
+import mx.gob.cultura.portal.response.Document;
 import mx.gob.cultura.portal.response.Entry;
 import org.semanticwb.SWBPlatform;
 import org.semanticwb.model.User;
@@ -286,13 +288,19 @@ public void doDelete(HttpServletRequest request, HttpServletResponse response, S
 
     private Entry getEntry(String id) throws IOException {
         String baseUri = getResourceBase().getWebSite().getModelProperty("search_endPoint");
+        Entry entry =new Entry();
         if (null == baseUri || baseUri.isEmpty()) {
             baseUri = SWBPlatform.getEnv("rnc/endpointURL").trim();
         }
-
-        String uri = baseUri + "/api/v1/search?identifier="+id;
-        GetBICRequest req = new GetBICRequest(uri);
-        Entry entry = req.makeRequest();            
+        String uri = baseUri + "/api/v1/search?q="+id+"&attr=oaiid";
+        //String uri = baseUri + "/api/v1/search?identifier="+id;
+        //GetBICRequest req = new GetBICRequest(uri);
+        //Entry entry = req.makeRequest();       
+        ListBICRequest req = new ListBICRequest(uri);        
+        Document document = req.makeRequest();
+        if(document!=null&&document.getRecords()!=null&&document.getRecords().get(0)!=null){
+            entry=document.getRecords().get(0);
+        }         
         return entry;
     }
 
@@ -339,11 +347,15 @@ private Map<String,String> annotationToMap(Annotation annotation, String userId)
         try {
             Entry entry = getEntry(annotation.getTarget());
             if (entry!=null){                
+                if(entry.getId()!=null){
+                    map.put("oid",entry.getId());
+                }    
                 if(entry.getRecordtitle()!=null){
                     map.put("bicTitle",entry.getRecordtitle().get(0).getValue());            
                 }    
-                if(entry.getCreator()!=null)
-                map.put("bicCreator",entry.getCreator().get(0));
+                if(entry.getCreator()!=null){
+                    map.put("bicCreator",entry.getCreator().get(0));
+                }    
             }
         } catch (IOException ex) {
             LOG.severe(ex.getMessage());

diff --git a/Components/src/main/java/mx/gob/cultura/portal/resources/MyAnnotations.java b/Components/src/main/java/mx/gob/cultura/portal/resources/MyAnnotations.java
@@ -14,7 +14,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import mx.gob.cultura.portal.persist.AnnotationMgr;
+import mx.gob.cultura.portal.request.GetBICRequest;
 import mx.gob.cultura.portal.response.Annotation;
+import mx.gob.cultura.portal.response.Entry;
+import org.semanticwb.SWBPlatform;
 import org.semanticwb.model.User;
 import org.semanticwb.model.UserRepository;
 import org.semanticwb.portal.api.GenericResource;
@@ -44,11 +47,15 @@ public void processRequest(HttpServletRequest request, HttpServletResponse respo
 
     @Override
     public void doView(HttpServletRequest request, HttpServletResponse response, SWBParamRequest paramRequest) throws SWBResourceException, IOException {
-System.out.println("********************doView");        
-        String id=request.getParameter("id");
-System.out.println("id:"+id);
+        String oid=request.getParameter("id");  
+        String id="";
+        if (oid!=null&&!oid.isEmpty()){
+            Entry entry = getEntry(oid);
+            if (entry!=null&&entry.getIdentifier()!=null&&entry.getIdentifier().get(0)!=null){                
+                id= entry.getIdentifier().get(0).getValue(); 
+            }
+        }
         User user = paramRequest.getUser();
-System.out.println("user:"+user);  
         response.setContentType("text/html; charset=UTF-8");
        // String basePath = "/work/models/" + paramRequest.getWebPage().getWebSite().getId() + "/jsp/" + this.getClass().getSimpleName() + "/";
         String path = "/swbadmin/jsp/rnc/"+this.getClass().getSimpleName()+"/view.jsp";
@@ -65,19 +72,16 @@ public void doView(HttpServletRequest request, HttpServletResponse response, SWB
         try {
             request.setAttribute("paramRequest", paramRequest);
             request.setAttribute("annotations", annotationList);
+            request.setAttribute("id", id);
             dis.include(request, response);
         } catch (ServletException se) {
             LOG.severe(se.getMessage());
         }        
     }
     public void doAdd(HttpServletRequest request, HttpServletResponse response, SWBParamRequest paramRequest) throws SWBResourceException, IOException {
-System.out.println("********************doAdd");       
         String target = request.getParameter("id");
-System.out.println("target:"+target);
         String bodyValue = request.getParameter("bodyValue");
-System.out.println("bodyValue:"+bodyValue);
         User user = paramRequest.getUser(); 
-System.out.println("user:"+user);  
 
         UserRepository ur=paramRequest.getWebPage().getWebSite().getUserRepository();
         String userId = null;
@@ -87,7 +91,6 @@ public void doAdd(HttpServletRequest request, HttpServletResponse response, SWBP
                 bodyValue!=null&& !bodyValue.isEmpty()){           
                 Annotation annotation =new Annotation(bodyValue,target,user.getId());
                 String annotationId=AnnotationMgr.getInstance().addAnnotation(annotation);
-System.out.println(annotationId);
             }            
         }
         PrintWriter out = response.getWriter();
@@ -113,8 +116,16 @@ public void doAdd(HttpServletRequest request, HttpServletResponse response, SWBP
             sb.deleteCharAt(sb.length()-1);
         }
         sb.append("]");
-System.out.println(sb);        
         out.print(sb.toString());
     }
-
+    private Entry getEntry(String id) throws IOException {
+        String baseUri = getResourceBase().getWebSite().getModelProperty("search_endPoint");
+        if (null == baseUri || baseUri.isEmpty()) {
+            baseUri = SWBPlatform.getEnv("rnc/endpointURL").trim();
+        }
+        String uri = baseUri + "/api/v1/search?identifier="+id;
+        GetBICRequest req = new GetBICRequest(uri);
+        Entry entry = req.makeRequest();         
+        return entry;
+    }    
 }
diff --git a/SWB/src/main/webapp/swbadmin/jsp/rnc/AnnotationsMgr/view.jsp b/SWB/src/main/webapp/swbadmin/jsp/rnc/AnnotationsMgr/view.jsp
@@ -92,21 +92,21 @@ console.log(element);
 %>        
         if(elem.isOwn && elem.isMod){
             liContent = '<li id="li'+elem.id+'">'
-                +'<a href="/swb/repositorio/detalle?id='+elem.target+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
+                +'<a href="/swb/repositorio/detalle?id='+elem.oid+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
                 +'<form><i>'+elem.creator+'</i>'+'<em>'+elem.created+'</em>'+'<textarea id="bv'+elem.id+'">'+elem.bodyValue+'</textarea>'
                 +'<button type="button" onclick="callAction(\'<%=modURL.toString()%>\',\''+elem.id+'\',$(\'#bv'+elem.id+'\').val());return false;">Cambiar</button>'
                 +'<a href="#" onclick="callAction(\'<%=delURL.toString()%>\',\''+elem.id+'\');return false;">Borrar</a>'
                 +'<a href="#" onclick="callAction(\'<%=accURL.toString()%>\',\''+elem.id+'\');return false;">Autorizar</a>'
                 +'</form>'+ext+'</li>';
         }else if(elem.isMod){
             liContent = '<li id="li'+elem.id+'">'
-                +'<a href="/swb/repositorio/detalle?id='+elem.target+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
+                +'<a href="/swb/repositorio/detalle?id='+elem.oid+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
                 +'<i>'+elem.creator+'</i>'+'<em>'+elem.created+'</em>'+elem.bodyValue                        
                 +'<a href="#" onclick="callAction(\'<%=accURL.toString()%>\',\''+elem.id+'\');return false;">Autorizar</a>'
                 +''+ext+'</li>';
         }else{            
             liContent = '<li id="li'+elem.id+'">'
-                +'<a href="/swb/repositorio/detalle?id='+elem.target+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
+                +'<a href="/swb/repositorio/detalle?id='+elem.oid+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
                 +'<i>'+elem.creator+'</i>'+'<em>'+elem.created+'</em>'+elem.bodyValue                                        
                 +'<a href="#" onclick="callAction(\'<%=rjcURL.toString()%>\',\''+elem.id+'\');return false;">Desautorizar</a>'
                 +''+ext+'</li>';
@@ -117,13 +117,15 @@ console.log(element);
 %>        
         if(elem.isMod){
             liContent = '<li id="li'+elem.id+'">'
-                +'<a href="/swb/repositorio/detalle?id='+elem.target+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
+                +'<a href="/swb/repositorio/detalle?id='+elem.oid+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
                 +'<form><!--'+elem.creator+'-->'+'<em>'+elem.created+'</em>'+'<textarea id="bv'+elem.id+'">'+elem.bodyValue+'</textarea>'
                 +'<button type="button" onclick="callAction(\'<%=modURL.toString()%>\',\''+elem.id+'\',$(\'#bv'+elem.id+'\').val());return false;">Cambiar</button>'
                 +'<a href="#" onclick="callAction(\'<%=delURL.toString()%>\',\''+elem.id+'\');return false;">Borrar</a>'
                 +'</form>'+ext+'</li>';
         }else{            
-            liContent = '<li id="li'+elem.id+'"><i>'+elem.creator+'</i>'+'<em>'+elem.created+'</em>'+elem.bodyValue                        
+            liContent = '<li id="li'+elem.id+'">'
+                +'<a href="/swb/repositorio/detalle?id='+elem.oid+'">'+elem.bicTitle+'('+elem.bicCreator+')</a>'
+                +'<i>'+elem.creator+'</i>'+'<em>'+elem.created+'</em>'+elem.bodyValue                        
                 +''+ext+'</li>';
         }
 <%  
@@ -147,7 +149,7 @@ console.log(element);
     for(Map<String,String> annotation:annotations){
      %>
      <li id="li<%=annotation.get("id")%>">
-        <a href="/swb/repositorio/detalle?id=<%=annotation.get("target")%>"><%=annotation.get("bicTitle")%>(<%=annotation.get("bicCreator")%>)</a>
+        <a href="/swb/repositorio/detalle?id=<%=annotation.get("oid")%>"><%=annotation.get("bicTitle")%>(<%=annotation.get("bicCreator")%>)</a>
 <%      
         if(annotation.containsKey("isOwn")&&annotation.containsKey("isMod")){   
 

diff --git a/SWB/src/main/webapp/swbadmin/jsp/rnc/MyAnnotations/view.jsp b/SWB/src/main/webapp/swbadmin/jsp/rnc/MyAnnotations/view.jsp
@@ -14,7 +14,7 @@
 <%
     List<Annotation> annotations = (List<Annotation>) request.getAttribute("annotations");
     User user = paramRequest.getUser();
-    String id=request.getParameter("id");
+    String id = (String)request.getAttribute("id");
     UserRepository ur=paramRequest.getWebPage().getWebSite().getUserRepository();
 
     if(user!=null && user.isSigned()){