obsolete reports, handle negative ingest vals

src-admintool/config/reports.yml

@@ -481,35 +481,13 @@ replic_processed:
   description: |
     Count the number of object replications performed over a period of time.
     The need for replication is driven by ingest actions or by the reconfiguration of storage nodes, so the number of records processed over time may be irregular.
-doi:
-  link-title: DOI Ark Conflicts
-  breadcrumb: bp_obj
-  class: DoiConflictQuery
-  category: objects
-  description: |
-    Identify potential localid conflicts by looking for duplicate DOI's within `inv_objects.erc_where`.  
-    This issue has occasionally occurred for Dryad content.
-doi_dryad:
-  link-title: Dryad Counts by Campus DOI
-  breadcrumb: bp_obj
-  class: DoiDryadQuery
-  category: objects
-  description: |
-    Compute stats by campus DOI shoulders.
 localid_no_ark:
   link-title: Local Id No Ark
   breadcrumb: bp_obj
   class: LocalidNoIdQuery
   category: objects
   description: |
     List counts of localids with no corresponding arks.  No [resolution](https://github.com/CDLUC3/mrt-doc/issues/1047) has been implemented yet.
-big_ingest:
-  link-title: Big Ingests (conatining 200+ objects) - Last 14 days
-  breadcrumb: bp_ingest
-  class: BigIngestQuery
-  category: ingest
-  description: |
-    Enumerate large batch ingests (by object count) in the last X days.
 recent_ingests:
   link-title: Recent Ingests
   breadcrumb: bp_ingest

src-admintool/queries/collections_by_time_cumulative_query.rb

@@ -68,6 +68,8 @@ def get_sql
             date_added >= ?
           and
             date_added < ?
+          and
+            #{verify_files_col(@col)} > 0
           #{
             if @source == 'producer'
               " and source='producer'"
@@ -82,6 +84,8 @@ def get_sql
             owner_coll_mime_use_details ocmud
           where
             oc.ogroup = ocmud.ogroup
+          and
+            #{verify_files_col(@col)} > 0
           and
             oc.inv_collection_id = ocmud.inv_collection_id
           and

src-admintool/queries/collections_by_time_query.rb

@@ -87,6 +87,8 @@ def get_sql
             date_added >= ?
           and
             date_added < ?
+          and
+            #{verify_files_col(@col)} > 0
             #{
               if @source == 'producer'
                 " and source='producer'"

src-admintool/queries/ingest_by_month_query.rb

@@ -33,6 +33,7 @@ def get_sql
         on times.ts = date_add(date(f.date_added), interval - dayofmonth(f.date_added) + 1 DAY)
         and f.date_added >= '#{@tstart}'
         and f.date_added < '#{@tend}'
+        and f.billable_size >= 0
       group by timeblock
       order by timeblock
       ;

src-admintool/queries/ingest_by_week_query.rb

@@ -53,6 +53,7 @@ def get_sql
         on times.ts = date_add(date(f.date_added), interval - dayofweek(f.date_added) DAY)
         and f.date_added >= '#{@tstart}'
         and f.date_added < '#{@tend}'
+        and f.billable_size >= 0
       group by timeblock
       order by timeblock
       ;

src-admintool/queries/ingest_by_year_query.rb

@@ -33,6 +33,7 @@ def get_sql
         on times.ts = date_add(date(f.date_added), interval - dayofyear(f.date_added) + 1 DAY)
         and f.date_added >= '#{@tstart}'
         and f.date_added < '#{@tend}'
+        and f.billable_size >= 0
       group by timeblock
       order by timeblock
       ;

src-admintool/queries/invoices_query.rb

@@ -186,6 +186,8 @@ def get_sql
         ogroup like ?
       and
         collection_name not like '% Dash'
+      and
+        collection_name not like '%Dryad%'
     }
 
     %{

src-admintool/web/index.html

@@ -120,6 +120,7 @@ <h3>Campus Collections</h3>
    <div class="nav_section nav_campus nav_campus_invoices">
       <h3>Campus Invoices</h3>
       <ul>
+        <li class="campus"><a class="json" href="{{ADMINTOOL_HOME}}?path=invoices&fy=2024">FY2024 Invoices</a></li>
         <li class="campus"><a class="json" href="{{ADMINTOOL_HOME}}?path=invoices&fy=2023">FY2023 Invoices</a></li>
         <li class="campus"><a class="json" href="{{ADMINTOOL_HOME}}?path=invoices&fy=2022">FY2022 Invoices</a></li>
         <li class="campus"><a class="json" href="{{ADMINTOOL_HOME}}?path=invoices&fy=2021">FY2021 Invoices</a></li>
@@ -274,7 +275,6 @@ <h3>Objects Files</h3>
     <div class="nav_section nav_objects nav_objects_localid">
       <h3>Objects Local Id</h3>
       <ul>
-        <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=doi">DOI Ark Conflicts</a></li>
         <li class="objects"><a href="{{ADMINTOOL_HOME}}?path=con_localid">Counts: Objects Missing LocalId</a></li>
         <li class="objects"><a href="{{ADMINTOOL_HOME}}?path=object_localid_needed">Objects Missing LocalId</a></li>
         <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=localid_no_ark">Local id without Ark Counts</a></li>
@@ -365,7 +365,6 @@ <h3>Ingest Activity</h3>
         <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=ingest_bytes_by_month">Bytes ingested by Month</a></li>
         <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=ingest_bytes_by_year">Bytes ingested by Year</a></li>
         <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=recent_ingests">Recent Ingests</a></li>
-        <li class="objects"><a href="{{ADMINTOOL_HOME}}?path=big_ingest&items=200&days=14">Big Ingests (200+) - Last 14 days</a></li>
       </ul>
     </div>
 
@@ -548,11 +547,6 @@ <h2>Content Projects</h2>
     </div>
 
     <div class="nav_section nav_content_projects">
-      <h3>Dryad</h3>
-      <ul>
-        <li class="graph"><a href="{{ADMINTOOL_HOME}}?path=doi_dryad">Dryad Counts by Campus DOI</a></li>
-      </ul>
-
       <h3>Inventory Comparison</h3>
       <ul>
         <li class="graph">
@@ -567,22 +561,22 @@ <h3>Inventory Comparison</h3>
             <input type="submit" value="Go!"/>
           </form>
       </ul>
+      <h3>Prune Candidate Files</h3>
+      <ul>
+        <li class="graph">
+          <form action="{{ADMINTOOL_HOME}}">
+            Prune Candidate Files for a Mnemonic:
+            <select name="mnemonic">
+              {{#MCOLLS}}
+              <option value="{{mnemonic}}">{{mnemonic}}: {{name}}</option>
+              {{/MCOLLS}}
+            </select>
+            <input name="path" type="hidden" value="prune_candidates"/>
+            <input type="submit" value="Go!"/>
+          </form>
+      </ul>
     </div>
 
-    <h3>Prune Candidate Files</h3>
-    <ul>
-      <li class="graph">
-        <form action="{{ADMINTOOL_HOME}}">
-          Prune Candidate Files for a Mnemonic:
-          <select name="mnemonic">
-            {{#MCOLLS}}
-            <option value="{{mnemonic}}">{{mnemonic}}: {{name}}</option>
-            {{/MCOLLS}}
-          </select>
-          <input name="path" type="hidden" value="prune_candidates"/>
-          <input type="submit" value="Go!"/>
-        </form>
-    </ul>
   </div>
 
     </div>