fixed silly problems with finding the validate target feed

Author: barny

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.24.0
+current_version = 0.25.0
 commit = True
 tag = True
 

README.md

@@ -8,7 +8,7 @@
 
  SPDX-License-Identifier: MIT
 
- version="0.24.0"
+ version="0.25.0"
 
 What's New?
 ===========

elmclient/__meta__.py

@@ -9,7 +9,7 @@
 
 app = 'elmoslcquery'
 description = 'Commandline OSLC query for ELM'
-version = '0.24.0'
+version = '0.25.0'
 license = 'MIT'
 author_name = 'Ian Barnard'
 author_mail = 'ian.barnard@uk.ibm.com'

elmclient/examples/validate.py

@@ -85,9 +85,9 @@ def do_validate(inputargs=None):
     parser_validate = subparsers.add_parser('validate', help='Validate a feed on this app' )
 
     parser_validate.add_argument( 'feedid', help='The feed id - this can be an integer corresponding to the number in the list of feeds, or a unique string (case-sensitive!) which matches part of or all of exactly one feed ID or name')
-    parser_validate.add_argument('-r', '--repair', action="store_true", help="Use to automatically resolve problems encountered in the feed. Ignored if not supported by the feed.")
-    parser_validate.add_argument('-s', '--resetIncrementalData', action="store_true", help="Same the web UI option. If true the system will discard past validation results and recheck the entire feed again. Otherwise, only changes since last time will be validated. This option is normally only needed if indicated so by IBM support.")
     parser_validate.add_argument('-f', '--full', action="store_true", help="Same the web UI option. If true the entire TRS feed will be checked, which takes much longer. This may return more accurate results. This does not discard past validation results, so future validations can still be incremental. If this option consistently returns different results then you may need to also reset the incremental data")
+    parser_validate.add_argument('-i', '--resetIncrementalData', action="store_true", help="Same the web UI option. If true the system will discard past validation results and recheck the entire feed again. Otherwise, only changes since last time will be validated. This option is normally only needed if indicated so by IBM support.")
+    parser_validate.add_argument('-r', '--repair', action="store_true", help="Use to automatically resolve problems encountered in the feed. Ignored if not supported by the feed.")
 
     args = parser.parse_args(inputargs)
 
@@ -229,9 +229,11 @@ def do_validate(inputargs=None):
             feedid = int( args.feedid )
             if feedid < 0 or feedid > len(feeds):
                 raise Exception( f"Invalid feed number {feedid}" )
-            id = feeds[feedid]['id']
+            theid = feeds[feedid]['id']
             name = feeds[feedid]['name']
-            print( f"Using list entry {feedid} which has {id=} and {name=}" )
+            print( f"Using list entry {feedid} which has {theid=} and {name=}" )
+#            print( f"Validating feed '{theid}' '{feeds[feedid]['name']}'" )
+#            theid = feeds[id]['id']
         # or try to match a string against the feed IDs or names - zero or >1 match is an error!
         else:
             matches = 0
@@ -249,9 +251,8 @@ def do_validate(inputargs=None):
                 raise Exception( f"No id or name contains '{args.feedid}'" )
             if matches > 1:
                 raise Exception( f"id '{args.feedid}' matches more than one id or name" )
-            id = firstid
-        theid = feeds[id]['id']
-        print( f"Validating feed '{feeds[id]['name']}'" )
+            theid = feeds[firstid]['id']
+            print( f"Validating feed '{theid}' '{feeds[firstid]['name']}'" )
 
         result = app.validate( theid, repair=args.repair, resetIncrementalData=args.resetIncrementalData, full=args.full )
 #        print( f"{result=}" )

setup.py

@@ -16,7 +16,7 @@
 # This call to setup() does all the work
 setup(
     name="elmclient",
-    version="0.24.0",
+    version="0.25.0",
     description="Python client for ELM with examples of OSLC Query, ReqIF import/export, Reportable REST, and more",
     long_description=README,
     long_description_content_type="text/markdown",