Changeset 2149

Timestamp:

Apr 4, 2006, 3:50:40 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

First version of reporter list view
Updated ReporterFlatFileImporter? to be able to import reporters to a reporter list (including score)

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ItemModifiedException.java (modified) (1 diff)
• src/core/net/sf/basedb/core/PermissionDeniedException.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ReporterBatcher.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ReporterList.java (modified) (5 diffs)
• src/core/net/sf/basedb/core/data/ReporterData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/ReporterListData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/ReporterListScoreData.hbm.xml (added)
• src/core/net/sf/basedb/core/data/ReporterListScoreData.java (added)
• src/core/net/sf/basedb/plugins/ReporterFlatFileImporter.java (modified) (18 diffs)
• src/test/TestReporterList.java (modified) (3 diffs)
• www/include/menu.jsp (modified) (2 diffs)
• www/views/reporterlists (added)
• www/views/reporterlists/edit_reporterlist.jsp (added)
• www/views/reporterlists/index.jsp (added)
• www/views/reporterlists/list_reporterlists.jsp (added)
• www/views/reporterlists/view_reporterlist.jsp (added)

trunk/src/core/net/sf/basedb/core/Install.java

@@ -1771 +1771 @@
       if (pd != null)
       {
-        log.info("createPluginDefinition: EXISTS [className="+className+"; jarPath="+jarPath+"]");
+        pd.loadPluginInformation(className, jarPath);
+        dc.commit();
+        log.info("createPluginDefinition: UPDATED [className="+className+"; jarPath="+jarPath+"]");
       }
       else

trunk/src/core/net/sf/basedb/core/ItemModifiedException.java

@@ -61 +61 @@
   public ItemModifiedException(org.hibernate.StaleStateException ex)
   {
-    this(findWhat(ex));
+    super("The item "+findWhat(ex)+" was modified by another transaction.", ex);
   }
   

trunk/src/core/net/sf/basedb/core/PermissionDeniedException.java

@@ -76 +76 @@
     super("Permission denied: "+message);
   }
+  /**
+    Creates a new <code>PermissionDeniedException</code>. The error
+    message produced will look like: 
+    <code>Permission denied: <i>message</i></code>
+  
+    @param message The message explaining why permission was denied
+    @param cause The original cause of the exception
+  */
+  public PermissionDeniedException(String message, Throwable cause)
+  {
+    super("Permission denied: "+message, cause);
+  }
 
 }

trunk/src/core/net/sf/basedb/core/ReporterBatcher.java

@@ -202 +202 @@
   }
   
+  public boolean isInInsertQueue(String externalId)
+  {
+    return batchedExternalIds.contains(externalId);
+  }
+  
   /**
     Get a reporter when you know the external id. This method only checks the database,

trunk/src/core/net/sf/basedb/core/ReporterList.java

@@ -27 +27 @@
 import net.sf.basedb.core.data.ReporterListData;
 import net.sf.basedb.core.data.ReporterData;
+import net.sf.basedb.core.data.ReporterListScoreData;
 import net.sf.basedb.core.DataQuery;
 import net.sf.basedb.core.query.Restrictions;
@@ -184 +185 @@
     checkPermission(Permission.WRITE);
     if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    getData().getReporters().put(reporter, score);
+    ReporterListScoreData rlScore = getData().getReporterListScores().get(reporter);
+    if (rlScore == null)
+    {
+      rlScore = new ReporterListScoreData();
+      rlScore.setReporterList(this.getData());
+      rlScore.setReporter(reporter);
+      rlScore.setScore(score);
+      getData().getReporterListScores().put(reporter, rlScore);
+    }
+    else
+    {
+      rlScore.setScore(score);
+    }
   }
 
@@ -192 +205 @@
     checkPermission(Permission.WRITE);
     if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    getData().getReporters().remove(reporter);
+    getData().getReporterListScores().remove(reporter);
   }
   
@@ -199 +212 @@
   {
     if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    return getData().getReporters().get(reporter);
+    ReporterListScoreData score = getData().getReporterListScores().get(reporter);
+    return score == null ? null : score.getScore();
   }
 
@@ -205 +219 @@
   {
     DataQuery<ReporterData> query = Reporter.getQuery();
-    query.joinPermanent(Hql.innerJoin("reporterLists", Item.REPORTERLIST.getAlias()));
+    query.joinPermanent(Hql.innerJoin("reporterListScores", Item.REPORTERLIST.getAlias()));
     query.restrictPermanent(
       Restrictions.eq(
-        Hql.alias(Item.REPORTERLIST.getAlias()),
+        Hql.property(Item.REPORTERLIST.getAlias(), "reporterList"),
         Hql.entity(this)
       )

trunk/src/core/net/sf/basedb/core/data/ReporterData.java

@@ -175 +175 @@
   }
   
-  private Set<ReporterListData> reporterLists;
+  private Set<ReporterListScoreData> reporterListScores;
   /**
     The lists this reporter is used in. This is the inverse end.
     @see ReporterListData#getReporters()
-    @hibernate.set lazy="true" inverse="true" table="`ReporterListScores`"
+    @hibernate.set lazy="true" inverse="true"
     @hibernate.collection-key column="`reporter_id`"
-    @hibernate.collection-many-to-many column="`reporterlist_id`" class="net.sf.basedb.core.data.ReporterListData"
+    @hibernate.collection-one-to-many class="net.sf.basedb.core.data.ReporterListScoreData"
   */
-  Set<ReporterListData> getReporterLists()
+  Set<ReporterListScoreData> getReporterListScores()
   {
-    return reporterLists;
+    return reporterListScores;
   }
-  void setReporterLists(Set<ReporterListData> reporterLists)
+  void setReporterListScores(Set<ReporterListScoreData> reporterListScores)
   {
-    this.reporterLists = reporterLists;
+    this.reporterListScores = reporterListScores;
   }
   

trunk/src/core/net/sf/basedb/core/data/ReporterListData.java

@@ -74 +74 @@
   }
 
-  private Map<ReporterData, Float> reporters;
+  private Map<ReporterData, ReporterListScoreData> reporters;
   /**
     The list of reporters and their scores.
-    @hibernate.map lazy="true" table="`ReporterListScores`"
+    @hibernate.map lazy="true" inverse="true" cascade="all"
     @hibernate.collection-key column="`reporterlist_id`"
     @hibernate.index-many-to-many column="`reporter_id`" class="net.sf.basedb.core.data.ReporterData"
-    @hibernate.collection-element column="`score`" type="float"
+    @hibernate.collection-one-to-many class="net.sf.basedb.core.data.ReporterListScoreData"
   */
-  public Map<ReporterData, Float> getReporters()
+  public Map<ReporterData, ReporterListScoreData> getReporterListScores()
   {
     if (reporters == null)
     {
-      reporters = new HashMap<ReporterData, Float>();
+      reporters = new HashMap<ReporterData, ReporterListScoreData>();
     }
     return reporters;
   }
-  void setReporters(Map<ReporterData, Float> reporters)
+  void setReporterListScores(Map<ReporterData, ReporterListScoreData> reporters)
   {
     this.reporters = reporters;

trunk/src/core/net/sf/basedb/plugins/ReporterFlatFileImporter.java

@@ -25 +25 @@
 package net.sf.basedb.plugins;
 
-import net.sf.basedb.core.SessionControl;
+import net.sf.basedb.core.ReporterList;
 import net.sf.basedb.core.RequestInformation;
 import net.sf.basedb.core.PluginParameter;
@@ -42 +42 @@
 import net.sf.basedb.core.ItemQuery;
 import net.sf.basedb.core.Job;
+import net.sf.basedb.core.Type;
 import net.sf.basedb.core.query.Orders;
 import net.sf.basedb.core.query.Hql;
@@ -50 +51 @@
 import net.sf.basedb.core.plugin.Request;
 import net.sf.basedb.core.plugin.Response;
-import net.sf.basedb.core.plugin.ParameterValues;
 import net.sf.basedb.core.plugin.About;
 import net.sf.basedb.core.plugin.AboutImpl;
@@ -57 +57 @@
 import net.sf.basedb.util.FlatFileParser;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
@@ -63 +64 @@
 import java.util.HashMap;
 import java.util.Set;
-import java.util.Collections;
 
 /**
@@ -90 +90 @@
 
   private static final Set<GuiContext> guiContexts = 
-    Collections.singleton(new GuiContext(Item.REPORTER, GuiContext.Type.LIST));
+    new HashSet<GuiContext>(Arrays.asList(
+      new GuiContext(Item.REPORTER, GuiContext.Type.LIST),
+      new GuiContext(Item.REPORTERLIST, GuiContext.Type.ITEM)
+    ));
 
   private static final StringParameterType requiredColumnMapping = new StringParameterType(255, null, true);
   private static final StringParameterType optionalColumnMapping = new StringParameterType(255, null, false);
-  private static final BooleanParameterType updateExistingType = new BooleanParameterType(null, true);
+  private static final BooleanParameterType updateExistingType = new BooleanParameterType(false, true);
   
   private static final PluginParameter<String> nameColumnMapping = new PluginParameter<String>(
@@ -124 +127 @@
     );
 
+  private static final PluginParameter<String> scoreColumnMapping = new PluginParameter<String>(
+      "scoreColumnMapping",
+      "Score",
+      "Mapping that picks the reporter's score in some context. This mapping is only " +
+        "used when importing to a reporter list.",
+      optionalColumnMapping
+      );
+
+  
   private static final PluginParameter<Boolean> updateExistingParameter = new PluginParameter<Boolean>(
     "updateExisting",
@@ -132 +144 @@
     );
 
-  private ItemParameterType<ReporterType> reporterTypeType;
   private PluginParameter<ReporterType> reporterTypeParameter;
+  private PluginParameter<ReporterList> reporterListParameter;
   
   private List<PluginParameter<String>> allColumnMappings;
@@ -157 +169 @@
     return about;
   }
-  
-  @Override
-  public void init(SessionControl sc, ParameterValues configuration, ParameterValues job)
-    throws BaseException
-  {
-    super.init(sc, configuration, job);
-    
-    // Load reporter types and initialise the reporterTypeParameter
-    DbControl dc = sc.newDbControl();
-    ItemQuery<ReporterType> query = ReporterType.getQuery();
-    query.order(Orders.asc(Hql.property("name")));
-    List<ReporterType> reporterTypes = new ArrayList<ReporterType>(query.list(dc));
-    
-    reporterTypeType = new ItemParameterType<ReporterType>(ReporterType.class, null, false, 1, reporterTypes);
-    // reporterTypes.add(null);
-    // reporterTypes.addAll(ReporterType.getQuery().list(dc));
-    // TODO - add as parameter in constructor
-    //reporterTypeType.setItems(reporterTypes);
-    dc.close();
-    reporterTypeParameter = new PluginParameter<ReporterType>(
-      "reporterType",
-      "Reporter type",
-      "The reporter type assigned to the imported reporters",
-      reporterTypeType);
-    
-    // Column mappings
-    allColumnMappings = new ArrayList<PluginParameter<String>>();
-    allColumnMappings.add(nameColumnMapping);
-    allColumnMappings.add(reporterIdColumnMapping);
-    allColumnMappings.add(descriptionColumnMapping);
-    allColumnMappings.add(symbolColumnMapping);
-    for (ExtendedProperty ep : ExtendedProperties.getProperties("ReporterData"))
-    {
-      allColumnMappings.add(
-        new PluginParameter<String>(
-          "extendedColumnMapping."+ep.getName(),
-          ep.getTitle(),
-          ep.getDescription(),
-          optionalColumnMapping
-          )
-        );
-    }
-  
-    // RequestInformation object for CONFIGURE_PLUGIN
-    List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
-
-    // Reporter type
-    parameters.add(reporterTypeParameter);
-    
-    // Parser regular expressions
-    parameters.add(parserSection);
-    parameters.add(headerRegexpParameter);
-    parameters.add(dataHeaderRegexpParameter);
-    parameters.add(dataSplitterRegexpParameter);
-    parameters.add(ignoreRegexpParameter);
-    parameters.add(dataFooterRegexpParameter);
-    parameters.add(minDataColumnsParameter);
-    parameters.add(maxDataColumnsParameter);
-
-    // Column mappings
-    parameters.add(mappingSection);
-    parameters.addAll(allColumnMappings);
-    
-    configurePlugin = new RequestInformation
-    (
-      Request.COMMAND_CONFIGURE_PLUGIN,
-      "File parser settings",
-      "TODO - description",
-      parameters
-    );
-
-    // RequestInformation for CONFIGURE_JOB
-    parameters = new ArrayList<PluginParameter<?>>();
-    parameters.add(fileParameter);
-    parameters.add(updateExistingParameter);
-    
-    configureJob = new RequestInformation
-    (
-      Request.COMMAND_CONFIGURE_JOB,
-      "Select file to import",
-      "TODO - description",
-      parameters
-    );
-  }
   // -------------------------------------------
   
@@ -256 +184 @@
   }
   /**
-    Always false, since plugin doesn't operate on individual items.
+    TRUE if the context is {@link Item#REPORTERLIST} and the
+    item is a {@link ReporterList}.
   */
   public boolean isInContext(GuiContext context, Object item)
   {
-    return false;
+    return (context.getItem() == Item.REPORTERLIST) && (item instanceof ReporterList);
   }
   /**
@@ -274 +203 @@
     if (command.equals(Request.COMMAND_CONFIGURE_PLUGIN))
     {
-      requestInformation = configurePlugin;
+      requestInformation = getConfigurePluginParameters(context);
     }
     else if (command.equals(Request.COMMAND_CONFIGURE_JOB))
     {
-      requestInformation = configureJob;
+      requestInformation = getConfigureJobParameters(context);
     }
     return requestInformation;
@@ -293 +222 @@
       if (command.equals(Request.COMMAND_CONFIGURE_PLUGIN))
       {
-        List<Throwable> errors = validateRequestParameters(configurePlugin.getParameters(), request);
+        List<Throwable> errors = validateRequestParameters(getConfigurePluginParameters(context).getParameters(), request);
         if (errors != null)
         {
@@ -310 +239 @@
         
         // Column mappings
-        for (PluginParameter<?> pp : allColumnMappings)
+        for (PluginParameter<?> pp : getAllColumnMappings())
         {
           storeValue(configuration, request, pp);
@@ -321 +250 @@
       else if (command.equals(Request.COMMAND_CONFIGURE_JOB))
       {
-        List<Throwable> errors = validateRequestParameters(configureJob.getParameters(), request);
+        List<Throwable> errors = validateRequestParameters(getConfigureJobParameters(context).getParameters(), request);
         if (errors != null)
         {
           response.setError(errors.size()+" invalid parameter(s) were found in the request", errors);
           return;
+        }
+        if (context.getItem() == Item.REPORTERLIST)
+        {
+          storeValue(job, request, reporterListParameter);
         }
         storeValue(job, request, fileParameter);
@@ -346 +279 @@
   private Map<String, String> columnMappings;
   private ReporterType reporterType;
+  private ReporterList reporterList;
   private boolean updateExisting;
   private int numInserted;
   private int numUpdated;
+  private int numAddedToList;
+  private Map<String, Float> deferred;
   
   /**
@@ -362 +298 @@
     batcher = ReporterBatcher.getNew(dc);
     reporterType = (ReporterType)configuration.getValue("reporterType");
+    reporterList = (ReporterList)job.getValue("reporterList");
+    if (reporterList != null) 
+    {
+      reporterList = ReporterList.getById(dc, reporterList.getId());
+      deferred = new HashMap<String, Float>();
+      numAddedToList = 0;
+    }
     updateExisting = (Boolean)job.getValue("updateExisting");
     columnMappings = new HashMap<String, String>();
-    for (PluginParameter<?> pp : allColumnMappings)
+    for (PluginParameter<?> pp : getAllColumnMappings())
     {
       columnMappings.put(pp.getName(), (String)configuration.getValue(pp.getName()));
@@ -381 +324 @@
     try
     {
+      batcher.flush();
+      if (reporterList != null)
+      {
+        // Add newly inserted reporters to the reporter list
+        for (Map.Entry<String, Float> entry : deferred.entrySet())
+        {
+          ReporterData reporter = batcher.getByExternalId(entry.getKey());
+          reporterList.addReporter(reporter, entry.getValue());
+          numAddedToList++;
+        }
+      }
       batcher.close();
       if (success)
@@ -410 +364 @@
     ReporterData reporter =  null;
     boolean useUpdate = false;
-    if (updateExisting && !batcher.exists(externalId, true, false))
-    {
+    
+    // Is the reporter already queued for insert?
+    if (!batcher.isInInsertQueue(externalId))
+    {
+      // No, it's not... try to load it from the database
       try
       {
         reporter = batcher.getByExternalId(externalId);
-        useUpdate = true;
       }
       catch (ItemNotFoundException ex)
       {
+        // It wasn't in the database either, create a new reporter
         reporter = Reporter.getNew(externalId);
-        useUpdate = false;
-      }
-    }
-    else if (!batcher.exists(externalId, true, true))
-    {
-      reporter = Reporter.getNew(externalId);
-      useUpdate = false;
-    }
+      }
+    }
+
+    // If we have a reporter object, we must set the properties or add it to a reporter list
     if (reporter != null)
     {
-      if (reporterType != null) Reporter.setReporterType(reporter, reporterType);
-      String name = data.map(columnMappings.get("nameColumnMapping"));
-      reporter.setName(name == null ? externalId : name);
-      reporter.setSymbol(data.map(columnMappings.get("symbolColumnMapping")));
-      reporter.setDescription(data.map(columnMappings.get("descriptionColumnMapping")));
+      int currentId = reporter.getId();
+      if (reporterList != null)
+      {
+        // Add to reporter list
+        Float score = (Float)Type.FLOAT.parseString(data.map(columnMappings.get("scoreColumnMapping")));
+        if (currentId == 0)
+        {
+          // It is a new reporter, we must wait to add it until the batcher has been flushed
+          deferred.put(externalId, score);
+        }
+        else
+        {
+          reporterList.addReporter(reporter, score);
+          numAddedToList++;
+        }
+      }
       
+      // The actual reporter needs updating or it is a new one
+      if ((updateExisting && currentId != 0) || currentId == 0)
+      {
+        
+        if (reporterType != null) Reporter.setReporterType(reporter, reporterType);
+        String name = data.map(columnMappings.get("nameColumnMapping"));
+        reporter.setName(name == null ? externalId : name);
+        reporter.setSymbol(data.map(columnMappings.get("symbolColumnMapping")));
+        reporter.setDescription(data.map(columnMappings.get("descriptionColumnMapping")));
+        
+        for (ExtendedProperty ep : ExtendedProperties.getProperties("ReporterData"))
+        {
+          reporter.setExtended(ep.getName(), ep.parseString(data.map(columnMappings.get("extendedColumnMapping."+ep.getName()))));
+        }
+        if (currentId != 0)
+        {
+          batcher.update(reporter);
+          numUpdated++;
+        }
+        else
+        {
+          batcher.insert(reporter);
+          numInserted++;
+        }
+      }
+    }
+  }
+  /**
+    Return <code>x new reporters; y updated reporters; z reporters added to list</code>.
+  */
+  protected String getSuccessMessage()
+  {
+    String addedToList = "";
+    if (reporterList != null)
+    {
+      addedToList = "; " + (numAddedToList == 1 ? 
+        "1 reporter added to list" : 
+        numAddedToList + " reporters added to list");
+    }
+    return numInserted + (numInserted == 1 ? " new reporter; " : " new reporters; ")
+      + numUpdated + (numUpdated == 1 ? " updated reporter" : " updated reporters")
+      + addedToList;
+  }
+  // -------------------------------------------
+  
+  private List<PluginParameter<String>> getAllColumnMappings()
+  {
+    if (allColumnMappings == null)
+    {
+      // Column mappings
+      allColumnMappings = new ArrayList<PluginParameter<String>>();
+      allColumnMappings.add(nameColumnMapping);
+      allColumnMappings.add(reporterIdColumnMapping);
+      allColumnMappings.add(descriptionColumnMapping);
+      allColumnMappings.add(symbolColumnMapping);
+      allColumnMappings.add(scoreColumnMapping);
       for (ExtendedProperty ep : ExtendedProperties.getProperties("ReporterData"))
       {
-        reporter.setExtended(ep.getName(), ep.parseString(data.map(columnMappings.get("extendedColumnMapping."+ep.getName()))));
-      }
-      if (useUpdate)
-      {
-        batcher.update(reporter);
-        numUpdated++;
-      }
-      else
-      {
-        batcher.insert(reporter);
-        numInserted++;
-      }
-    }
-  }
-  /**
-    Return <code>x new reporters; y updated reporters</code>.
-  */
-  protected String getSuccessMessage()
-  {
-    return numInserted + (numInserted == 1 ? " new reporter; " : " new reporters; ")
-      + numUpdated + (numUpdated == 1 ? " updated reporter" : " updated reporters");
-  }
-  // -------------------------------------------
-
+        allColumnMappings.add(
+          new PluginParameter<String>(
+            "extendedColumnMapping."+ep.getName(),
+            ep.getTitle(),
+            ep.getDescription(),
+            optionalColumnMapping
+            )
+          );
+      }
+      
+    }
+    return allColumnMappings;
+  }
+  
+  
+  private RequestInformation getConfigureJobParameters(GuiContext context)
+  {
+    if (configureJob == null)
+    {
+      // RequestInformation for CONFIGURE_JOB
+      List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
+      if (context.getItem() == Item.REPORTERLIST)
+      {
+        ItemParameterType<ReporterList> reporterListType = new ItemParameterType<ReporterList>(ReporterList.class, null, true, 1, null);
+        reporterListParameter = new PluginParameter<ReporterList>(
+          "reporterList",
+          "Reporter list",
+          "The list to import reporters to",
+          reporterListType);
+        parameters.add(reporterListParameter);
+      }
+      parameters.add(fileParameter);
+      parameters.add(updateExistingParameter);
+      
+      configureJob = new RequestInformation
+      (
+        Request.COMMAND_CONFIGURE_JOB,
+        "Select a file to import reporter from",
+        "TODO - description",
+        parameters
+      );
+    }
+    return configureJob;
+  }
+  
+  private RequestInformation getConfigurePluginParameters(GuiContext context)
+  {
+    if (configurePlugin == null)
+    {
+      // Load reporter types and initialise the reporterTypeParameter
+      DbControl dc = sc.newDbControl();
+      ItemQuery<ReporterType> query = ReporterType.getQuery();
+      query.order(Orders.asc(Hql.property("name")));
+      List<ReporterType> reporterTypes = new ArrayList<ReporterType>(query.list(dc));
+      dc.close();
+      
+      ItemParameterType<ReporterType> reporterTypeType = new ItemParameterType<ReporterType>(ReporterType.class, null, false, 1, reporterTypes);
+      reporterTypeParameter = new PluginParameter<ReporterType>(
+        "reporterType",
+        "Reporter type",
+        "The reporter type assigned to the imported reporters",
+        reporterTypeType);
+          
+      // RequestInformation object for CONFIGURE_PLUGIN
+      List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
+
+      // Reporter type
+      parameters.add(reporterTypeParameter);
+      
+      // Parser regular expressions
+      parameters.add(parserSection);
+      parameters.add(headerRegexpParameter);
+      parameters.add(dataHeaderRegexpParameter);
+      parameters.add(dataSplitterRegexpParameter);
+      parameters.add(ignoreRegexpParameter);
+      parameters.add(dataFooterRegexpParameter);
+      parameters.add(minDataColumnsParameter);
+      parameters.add(maxDataColumnsParameter);
+
+      // Column mappings
+      parameters.add(mappingSection);
+      parameters.addAll(getAllColumnMappings());
+      
+      configurePlugin = new RequestInformation
+      (
+        Request.COMMAND_CONFIGURE_PLUGIN,
+        "File parser settings",
+        "TODO - description",
+        parameters
+      );
+
+    }
+    return configurePlugin;
+  }
+  
 }

trunk/src/test/TestReporterList.java

@@ -163 +163 @@
       dc.deleteItem(rl);
       dc.commit();
-      write("--Delete reporter lists OK");
-    }
-    catch (Throwable ex)
-    {
-      write("--Delete reporter lists FAILED");
+      write("--Delete reporter list OK");
+    }
+    catch (Throwable ex)
+    {
+      write("--Delete reporter list FAILED");
       ex.printStackTrace();
       ok = false;
@@ -211 +211 @@
       write_item(0, rl);
       DataQuery<ReporterData> query = Reporter.getQuery();
+      query.setMaxResults(maxNumber);
       DataResultIterator<ReporterData> reporters = query.iterate(dc);
       int i = 0;
@@ -228 +229 @@
     catch (Throwable ex)
     {
-      write("--Load reporters to list FAILED");
+      write("--Add reporters to list FAILED");
       ex.printStackTrace();
       ok = false;

trunk/www/include/menu.jsp

@@ -121 +121 @@
     
     final boolean hasReporters          = !sc.hasPermission(Permission.DENIED, Item.REPORTER); 
+    final boolean hasReporterLists      = !sc.hasPermission(Permission.DENIED, Item.REPORTERLIST); 
     final boolean createReporters       =  sc.hasPermission(Permission.CREATE, Item.REPORTER); 
     final boolean hasJobs               = !sc.hasPermission(Permission.DENIED, Item.JOB); 
@@ -328 +329 @@
         enabled="<%=hasReporters%>"
       />
+      <m:menuitem
+        title="Reporter lists"
+        onclick="<%="Menu.openUrl('"+root+"views/reporterlists/index.jsp?ID="+ID+"')"%>"
+        tooltip="<%=hasReporterLists ? "Manage reporter lists" : "You do not have permission to manage reporter lists"%>"
+        enabled="<%=hasReporterLists%>"
+      />
 
     </m:menu>