https://github.com/water-fountains/datablue/issues/41

and reduce debug logging
water-fountains · Jan 26, 2020 · 8cebc23 · 8cebc23
1 parent de1d253
commit 8cebc23
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/server/api/services/conflate.data.service.js b/server/api/services/conflate.data.service.js
@@ -269,7 +269,10 @@ function mergeFountainProperties(fountains, mergeNotes='', mergeDistance=null, d
         	            if (null != valueE) {
         	              const vE = cfg.value_translation_extra(valueE); 
         	              v.push(...vE);
-        	              l.info(`conflate.data.service.js: got additional category for "${p.id}" from "${src_name}": `+new Date().toISOString());
+        	              if (debugAll) {
+        	            	  l.info(`conflate.data.service.js: got additional category for "${p.id}" from "${src_name}": `
+        	            			  +new Date().toISOString());
+        	              }
         	            }
             	     }
         	      }

diff --git a/server/api/services/wikimedia.service.js b/server/api/services/wikimedia.service.js
@@ -62,7 +62,7 @@ class WikimediaService {
             l.info('wikimedia.service.js addToImgList foFeaImg: unknown src "'+imgListWithSource.src+'" "'+imgNam+'" ' +dbg + ' '+new Date().toISOString());
         }    
       };
-      if (0 < duplicateCount //&& debugAll
+      if (0 < duplicateCount && debugAll
     		  ) {
 		  l.info('wikimedia.service.js addToImgList foFeaImg: '+duplicateCount+' duplicates found among ' +imgListWithSource.imgs.length + ' - ' +dbg + ' '+new Date().toISOString());
       }
@@ -190,7 +190,10 @@ class WikimediaService {
       }else{
         let catNames = fProps.wiki_commons_name.value;
         if (1 < catNames.length) {
-            l.info('wikimedia.service.js: '+catNames.length+' commons categories defined "'+dbg+' '+city+' '+dbgIdWd+' "'+name+'" '+new Date().toISOString());
+        	if (debugAll || 2 < catNames.length) {
+        		l.info('wikimedia.service.js: '+catNames.length+' commons categories defined "'+dbg+' '
+        				+city+' '+dbgIdWd+' "'+name+'" '+new Date().toISOString());
+        	}
         }
   	    let catName = 'unkCatNam';
         for(let i = 0;i < catNames.length; i++) {
@@ -216,7 +219,7 @@ class WikimediaService {
         let galValPromises = [];
         let k = 0;
         const imgL = imgUrls.length;
-        const maxImgPreFetched = 4;
+        const maxImgPreFetched = 0; //as long as we don't filter for pre-fetched info, why prefetch ? https://github.com/water-fountains/datablue/issues/41
         for(;k < maxImgPreFetched && k < imgL;k++) { //only 5 imgs are on the gallery-preview
         	const img = imgUrls[k];
         	const imgFromMap = allMap.get(img.src+'_'+img.val);
@@ -282,7 +285,8 @@ class WikimediaService {
       } else {
          //could check the qualifiers as per https://github.com/water-fountains/proximap/issues/294
     	if (debugAll) {
-    		l.info("wikimedia.service.js: fillGallery "+dbgIdWd+" has no img "+city+ ' '+new Date().toISOString());
+    		l.info("wikimedia.service.js: fillGallery "+dbgIdWd+" has no img "+city+ 
+    				' '+dbg+' '+new Date().toISOString());
     	}
         resolve(fountain);      
       }