/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 48235

Added by Tsampikos Livisianos over 7 years ago

add jr1 report

             registry.addViewController("/sushilite/RR1").setViewName("redirect:/sushilite/RR1/");
             registry.addViewController("/sushilite/RR1/").setViewName("forward:/sushilite/RR1/index.html");
             /*
             registry.addViewController("/sushilite/JR1").setViewName("redirect:/sushilite/JR1/");
             registry.addViewController("/sushilite/JR1/").setViewName("forward:/sushilite/JR1/index.html");
             */
             super.addViewControllers(registry);
+        }

             return usageStats;
+        }
         protected String executeRepoId(String repositoryIdentifier) {
         protected String executeRepoId(String repositoryIdentifier, String report) {
             PreparedStatement st = null;
             Connection connection = null;
             ResultSet rs = null;
-...
                 String openaire_id = "-1";
                 switch (split[0].toLowerCase()) {
                     case "openaire":
                         st = connection.prepareStatement("select id from datasource where id=?");
                         st.setString(1, repositoryIdentifier.replaceFirst(split[0] + ":", ""));
                         if(!report.equals("jr1")) {
                             st = connection.prepareStatement("select id from datasource where id=?");
                             st.setString(1, repositoryIdentifier.replaceFirst(split[0] + ":", ""));
                         } else {
                             st = connection.prepareStatement("select id from datasource where id=? AND (type='Journal' OR type='Journal Aggregator/Publisher')");
                             st.setString(1, repositoryIdentifier.replaceFirst(split[0] + ":", ""));
+                        }
                         rs = st.executeQuery();
                         while (rs.next()) {
-...
                         return openaire_id;
                     case "opendoar":
                         st = connection.prepareStatement("select id from datasource_oids where orid=?");
                         st.setString(1, "opendoar____::" + repositoryIdentifier.replaceFirst(split[0] + ":", ""));
                         if(!report.equals("jr1")) {
                             st = connection.prepareStatement("select id from datasource_oids where orid=?");
                             st.setString(1, "opendoar____::" + repositoryIdentifier.replaceFirst(split[0] + ":", ""));
                         } else {
                             st = connection.prepareStatement("select distinct d.id from datasource d, datasource_oids di where di.orid=? and d.id=di.id and (type='Journal' OR type='Journal Aggregator/Publisher')");
                             st.setString(1, "opendoar____::" + repositoryIdentifier.replaceFirst(split[0] + ":", ""));
+                        }
                         rs = st.executeQuery();
                         while (rs.next()) {
                             openaire_id = rs.getString(1);
+                        }
                         return openaire_id;
                     case "issn":
                         st = connection.prepareStatement("select distinct d.id from datasource d, datasource_oids di, datasource_results dr where d.id=dr.id and di.orid like ? and d.id=di.id and (type='Journal' OR type='Journal Aggregator/Publisher')");
                         st.setString(1, "%" + repositoryIdentifier.replaceFirst(split[0] + ":", "") + "%");
                         rs = st.executeQuery();
                         while (rs.next()) {
                             openaire_id = rs.getString(1);
+                        }
                         return openaire_id;
                     default:
                         return "-1";
+                }
-...
                 DbUtils.closeQuietly(connection);
+            }
+        }
         protected void executeRepo(List<ReportItem> reportItems, String repositoryIdentifier, String itemDataType, Date beginDate, Date endDate, String granularity) {
             SimpleDateFormat report_dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat postgresFormat = new SimpleDateFormat("yyyy/MM");
-...
                 DbUtils.closeQuietly(connection);
+            }
+        }
         protected void executeJournal(List<ReportItem> reportItems, String repositoryIdentifier, String itemDataType, Date beginDate, Date endDate, String granularity) {
             SimpleDateFormat report_dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat postgresFormat = new SimpleDateFormat("yyyy/MM");
             String beginDateStr = postgresFormat.format(beginDate);
             String endDateStr = postgresFormat.format(endDate);
             Connection connection = null;
             PreparedStatement st = null;
             ResultSet rs = null;
             try {
                 connection = usageStatsDB.getConnection();
                 if (repositoryIdentifier.equals("")) {
                     if (itemDataType.equals("")) {
                         st = connection.prepareStatement("SELECT d.id, d.name, d.websiteurl, dois.orid, res.ddate, res.downloads, res.views FROM (SELECT coalesce(ds.source, vs.source), coalesce(ds.repository_id, vs.repository_id) AS repository_id, coalesce(ds.date, vs.date) AS ddate, coalesce(ds.sum, 0) AS downloads, coalesce(vs.sum,0) AS views FROM (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM downloads_stats s WHERE s.date>=? AND s.date<=? GROUP BY s.source, s.repository_id, s.date) AS ds FULL OUTER JOIN (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM views_stats s WHERE s.date>=? AND s.date<=? GROUP BY s.source, s.repository_id, s.date) AS vs ON ds.source=vs.source AND ds.repository_id=vs.repository_id AND ds.date=vs.date) AS res JOIN datasource d ON d.id=res.repository_id JOIN datasource_oids dois ON d.id=dois.id WHERE (d.type='Journal' OR d.type='Journal Aggregator/Publisher') ORDER BY d.id, d.name, res.ddate ASC;");
                         st.setString(1, beginDateStr);
                         st.setString(2, endDateStr);
                         st.setString(3, beginDateStr);
                         st.setString(4, endDateStr);
                     } else {
                         st = connection.prepareStatement("SELECT d.id, d.name, d.websiteurl, dois.orid, res.ddate, res.downloads, res.views FROM (SELECT coalesce(ds.source, vs.source), coalesce(ds.repository_id, vs.repository_id) AS repository_id, coalesce(ds.date, vs.date) AS ddate, coalesce(ds.sum, 0) AS downloads, coalesce(vs.sum,0) AS views FROM (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM downloads_stats s, result_classifications rc WHERE rc.id=s.result_id AND s.date>=? AND s.date<=? AND rc.type=? GROUP BY s.source, s.repository_id, s.date) AS ds FULL OUTER JOIN (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM views_stats s, result_classifications rc WHERE rc.id=s.result_id AND s.date>=? AND s.date<=? AND rc.type=? GROUP BY s.source, s.repository_id, s.date) AS vs ON ds.source=vs.source AND ds.repository_id=vs.repository_id AND ds.date=vs.date) AS res JOIN datasource d ON d.id=res.repository_id JOIN datasource_oids dois ON d.id=dois.id WHERE (d.type='Journal' OR d.type='Journal Aggregator/Publisher') ORDER BY d.id, d.name, res.ddate ASC;");
                         st.setString(1, beginDateStr);
                         st.setString(2, endDateStr);
                         st.setString(3, itemDataType);
                         st.setString(4, beginDateStr);
                         st.setString(5, endDateStr);
                         st.setString(6, itemDataType);
+                    }
                 } else {
                     if (itemDataType.equals("")) {
                         st = connection.prepareStatement("SELECT d.id, d.name, d.websiteurl, dois.orid, res.ddate, res.downloads, res.views FROM (SELECT coalesce(ds.source, vs.source), coalesce(ds.repository_id, vs.repository_id) AS repository_id, coalesce(ds.date, vs.date) AS ddate, coalesce(ds.sum, 0) AS downloads, coalesce(vs.sum,0) AS views FROM (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM downloads_stats s WHERE s.date>=? AND s.date<=? AND s.repository_id=? GROUP BY s.source, s.repository_id, s.date) AS ds FULL OUTER JOIN (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM views_stats s WHERE s.date>=? AND s.date<=? AND s.repository_id=? GROUP BY s.source, s.repository_id, s.date) AS vs ON ds.source=vs.source AND ds.repository_id=vs.repository_id AND ds.date=vs.date) AS res JOIN datasource d ON d.id=res.repository_id JOIN datasource_oids dois ON d.id=dois.id WHERE (d.type='Journal' OR d.type='Journal Aggregator/Publisher') ORDER BY d.id, d.name, res.ddate ASC;");
                         st.setString(1, beginDateStr);
                         st.setString(2, endDateStr);
                         st.setString(3, repositoryIdentifier);
                         st.setString(4, beginDateStr);
                         st.setString(5, endDateStr);
                         st.setString(6, repositoryIdentifier);
                     } else {
                         st = connection.prepareStatement("SELECT d.id, d.name, d.websiteurl, dois.orid, res.ddate, res.downloads, res.views FROM (SELECT coalesce(ds.source, vs.source), coalesce(ds.repository_id, vs.repository_id) AS repository_id, coalesce(ds.date, vs.date) AS ddate, coalesce(ds.sum, 0) AS downloads, coalesce(vs.sum,0) AS views FROM (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM downloads_stats s, result_classifications rc WHERE rc.id=s.result_id AND s.date>=? AND s.date<=? AND rc.type=? AND s.repository_id=? GROUP BY s.source, s.repository_id, s.date) AS ds FULL OUTER JOIN (SELECT s.source, s.repository_id, s.date, sum(s.count) FROM views_stats s, result_classifications rc WHERE rc.id=s.result_id AND s.date>=? AND s.date<=? AND rc.type=? AND s.repository_id=? GROUP BY s.source, s.repository_id, s.date) AS vs ON ds.source=vs.source AND ds.repository_id=vs.repository_id AND ds.date=vs.date) AS res JOIN datasource d ON d.id=res.repository_id JOIN datasource_oids dois ON d.id=dois.id WHERE (d.type='Journal' OR d.type='Journal Aggregator/Publisher') ORDER BY d.id, d.name, res.ddate ASC;");
                         st.setString(1, beginDateStr);
                         st.setString(2, endDateStr);
                         st.setString(3, itemDataType);
                         st.setString(4, repositoryIdentifier);
                         st.setString(5, beginDateStr);
                         st.setString(6, endDateStr);
                         st.setString(7, itemDataType);
                         st.setString(8, repositoryIdentifier);
+                    }
+                }
                 //log.error("RR STATEMENT:   " + st);
                 /*
                 String redis_key = MD5(st.toString());
                 if (jedis.hasKey(redis_key, "result")) {
                     reportItems.addAll(reportItemsFromJson((String) jedis.get(redis_key, "result")));
                     st.close();
                     connection.close();
                     return;
+                }
                 */
                 rs = st.executeQuery();
                 String repository = "";
                 String lastDate = "";
                 ReportItem reportItem = null;
                 /*
                 Calendar startCalendar = Calendar.getInstance();
                 startCalendar.setTime(beginDate);
                 Calendar endCalendar = Calendar.getInstance();
                 endCalendar.setTime(endDate);
                 */
                 int ft_total = 0;
                 int abstr = 0;
                 if (granularity.equalsIgnoreCase("totals")) {
                     while (rs.next()) {
                         if (!rs.getString(1).equals(repository)) {
                             if (reportItem != null) {
                                 reportItem.addPerformance(new ItemPerformance(report_dateFormat.format(beginDate), report_dateFormat.format(endDate), Integer.toString(ft_total), Integer.toString(abstr)));
                                 reportItems.add(reportItem);
+                            }
                             repository = rs.getString(1);
                             reportItem = new ReportItem(null, rs.getString(2), "Platform", null);
                             reportItem.addIdentifier(new ItemIdentifier("OpenAIRE", rs.getString(1)));
                             reportItem.addIdentifier(new ItemIdentifier("ISSN", rs.getString(4).substring(rs.getString(4).lastIndexOf(":") + 1)));
                             if(rs.getString(3) != null) {
                                 reportItem.addIdentifier(new ItemIdentifier("URL", rs.getString(3)));
+                            }
                             ft_total = 0;
                             abstr = 0;
+                        }
                         ft_total += rs.getInt(6);
                         abstr += rs.getInt(7);
+                    }
                     if (reportItem != null) {
                         reportItem.addPerformance(new ItemPerformance(report_dateFormat.format(beginDate), report_dateFormat.format(endDate), Integer.toString(ft_total), Integer.toString(abstr)));
                         reportItems.add(reportItem);
+                    }
                 } else if (granularity.equalsIgnoreCase("monthly")) {
                     Calendar endCal = Calendar.getInstance();
                     endCal.setTime(postgresFormat.parse(endDateStr));
                     endCal.add(Calendar.MONTH, 1);
                     Date endDateForZeros = endCal.getTime();
                     while (rs.next()) {
                         if (!rs.getString(1).equals(repository)) {
                             if (reportItem != null) {
                                 fillWithZeros(postgresFormat.parse(lastDate), endDateForZeros, reportItem);
                                 reportItems.add(reportItem);
+                            }
                             repository = rs.getString(1);
                             lastDate = beginDateStr;
                             reportItem = new ReportItem(null, rs.getString(2), "Platform", null);
                             reportItem.addIdentifier(new ItemIdentifier("OpenAIRE", rs.getString(1)));
                             reportItem.addIdentifier(new ItemIdentifier("ISSN", rs.getString(4).substring(rs.getString(4).lastIndexOf(":") + 1)));
                             if(rs.getString(3) != null) {
                                 reportItem.addIdentifier(new ItemIdentifier("URL", rs.getString(3)));
+                            }
+                        }
                         fillWithZeros(postgresFormat.parse(lastDate), postgresFormat.parse(rs.getString(5)), reportItem);
                         Calendar endC = Calendar.getInstance();
                         endC.setTime(postgresFormat.parse(rs.getString(5)));
                         endC.set(Calendar.DATE, endC.getActualMaximum(Calendar.DATE));
                         if (reportItem != null) {
                             reportItem.addPerformance(new ItemPerformance(report_dateFormat.format(postgresFormat.parse(rs.getString(5))), report_dateFormat.format(endC.getTime()), rs.getString(6), rs.getString(7)));
+                        }
                         endC.setTime(postgresFormat.parse(rs.getString(5)));
                         endC.add(Calendar.MONTH, 1);
                         lastDate = postgresFormat.format(endC.getTime());
+                    }
                     if (reportItem != null) {
                         fillWithZeros(postgresFormat.parse(lastDate), endDateForZeros, reportItem);
                         reportItems.add(reportItem);
+                    }
+                }
                 /*
                 jedis.put(redis_key, "persistent", "false");
                 jedis.put(redis_key, "query", st.toString());
                 jedis.put(redis_key, "result", toJson(reportItems));
                 jedis.put(redis_key, "fetchMode", "3");
                 */
                 rs.close();
                 st.close();
                 connection.close();
             } catch (Exception e) {
                 log.error("Repository Report failed: ", e);
             } finally {
                 DbUtils.closeQuietly(rs);
                 DbUtils.closeQuietly(st);
                 DbUtils.closeQuietly(connection);
+            }
+        }
         protected void executeBatchItems(List<ReportItem> reportItems, String repositoryIdentifier, String itemDataType, Date beginDate, Date endDate, String granularity) {
             SimpleDateFormat report_dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat postgresFormat = new SimpleDateFormat("yyyy/MM");

             String repoid = "";
             if (!repositoryIdentifier.equals("")) {
                 repoid = executeRepoId(repositoryIdentifier);
                 repoid = executeRepoId(repositoryIdentifier, reportName.toLowerCase());
                 if (repoid.equals("-1")) {
                     reportExceptions.add(new ReportException("3060", "Error", "Invalid Filter Value", "RepositoryIdentifier: " + repositoryIdentifier + " is not valid"));
+                }
-...
                         itemid = "-1";
+                }
+            }
             if (itemid.equals("") && repoid.equals("") && !reportName.equalsIgnoreCase("rr1")) {
             if (itemid.equals("") && repoid.equals("") && !reportName.equalsIgnoreCase("rr1") && !reportName.equalsIgnoreCase("jr1")) {
                 reportExceptions.add(new ReportException("3070", "Error", "Required Filter Missing", "ItemIdentifier or RepositoryIdentifier must be supplied"));
+            }
             if (reportName.equalsIgnoreCase("ar1")) {
-...
                 if (reportItems.isEmpty()) {
                     reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
+                }
             } else if (reportName.equals("")) {
             } else if (reportName.equalsIgnoreCase("jr1")) {
                 if (!repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)) {
                     executeJournal(reportItems, repoid, itemDataType, beginDateParsed, endDateParsed, granularity);
+                }
                 if (reportItems.isEmpty()) {
                     reportExceptions.add(new ReportException("3030", "Error", "No Usage Available for Requested Dates", "Service did not find any data"));
+                }
             }else if (reportName.equals("")) {
                 reportExceptions.add(new ReportException("3050", "Error", "Report argument is missing", "You must supply a Report argument"));
             } else {
                 reportExceptions.add(new ReportException("3000", "Error", "Report " + reportName + " not supported", "Supported reports: AR1, IR1, RR1"));

             <li><a href="./AR1/">AR1 Report</a></li>
             <li><a href="./IR1/">IR1 Report</a></li>
             <li><a href="./RR1/">RR1 Report</a></li>
             <!-- <li><a href="./JR1/">RR1 Report</a></li> -->
             <li><a href="./JR1/">JR1 Report</a></li>
         </ul>
     </center>
     </body>

         <h3>Report Request</h3>
         Report Name:
         <select name='Report'>
             <option value='JR1'>RR1</option>
             <option value='JR1'>JR1</option>
         </select>
         <br />
         Release:
-...
         <h4>Optional Filters</h4>
         <p>By default results are returned for all journals. Use this filter to get results for a single repository<br />
             Jounral Identifier format: <b>namespace:value</b><br />
             valid namespace: <b>openaire</b> or <b>ISSN</b>.<br />
             valid namespace: <b>openaire</b> or <b>issn</b>.<br />
         </p>
         JournalIdentifier:
         <input type="text" name="RepositoryIdentifier">

             -->
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-parent</artifactId>
             <version>1.5.3.RELEASE</version>
             <version>1.5.4.RELEASE</version>
         </parent>
         <dependencies>

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 48235

Added by Tsampikos Livisianos over 7 years ago