1
0

2 Ревизии 025dae2d39 ... dc6e6b08d2

Автор SHA1 Съобщение Дата
  George C. Privon dc6e6b08d2 v0.3.2 преди 2 седмици
  George C. Privon c58f4fd32b fix #17. do not multi-count proposals when different organizations have the same solicitation names преди 2 седмици
променени са 2 файла, в които са добавени 10 реда и са изтрити 2 реда
  1. 4 0
      CHANGELOG.md
  2. 6 2
      proposal_database.rkt

+ 4 - 0
CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## v0.3.x
 
+### v0.3.2 (23 April 2026)
+
+- Bufix for --list-open-calls to avoid incorrect proposal counts when different organizations have the same solicitation name.
+
 ### v0.3.1 (21 August 2025)
 
 - Annotate example configuration file with guidance.

+ 6 - 2
proposal_database.rkt

@@ -10,7 +10,7 @@
          "config.rkt") ; load configuration file
 
 (define prog-name "proposal_database.rkt")
-(define prog-version "v0.3.1")
+(define prog-version "v0.3.2")
 
 
 ; give us the date in YYYY-MM-DD format
@@ -64,7 +64,7 @@
   (displayln (string-append prog-name
                             " ("
                             prog-version
-                            "). Copyright 2019-2020, 2022-2025 George C. Privon.")))
+                            "). Copyright 2019-2020, 2022-2026 George C. Privon.")))
 
 ; decide whether to use singular or plural "proposal" based on the number of proposals
 (define (proposal-plurals Nprop)
@@ -293,11 +293,15 @@ resultdate TEXT DEFAULT '')")
          (define Nprop (query-value conn (string-append get_prop_count_base
                                                         "WHERE status='submitted' AND solicitation='"
                                                         (vector-ref call-entry 1)
+                                                        "' AND organization='"
+                                                        (vector-ref call-entry 0)
                                                         "'")))
          (define Nprop-PI
            (query-value conn (string-append get_prop_count_base
                                             "WHERE status='submitted' AND solicitation='"
                                             (vector-ref call-entry 1)
+                                            "' AND organization='"
+                                            (vector-ref call-entry 0)
                                             "' AND PI LIKE '%"
                                             PIname
                                             "%'")))