diff --git a/XmlDoc.cpp b/XmlDoc.cpp index b02314f6..bc715732 100644 --- a/XmlDoc.cpp +++ b/XmlDoc.cpp @@ -3724,7 +3724,8 @@ bool XmlDoc::indexWarcOrArc ( ) { // if WARC-Type: is not response, skip it. so if it // is a revisit then skip it i guess. - if ( strncmp ( warcType,"response", 8 ) != 0 ) { + if ( strncmp ( warcType,"response", 8 ) != 0 && + strncmp ( warcType,"revisit", 7 ) != 0) { //log("build: was not type response"); // read another warc record diff --git a/script/inject/__main__.py b/script/inject/__main__.py index 0d7b8ffe..dcc7cda9 100644 --- a/script/inject/__main__.py +++ b/script/inject/__main__.py @@ -108,7 +108,7 @@ def injectItem(item, db, mode): skipped = 0 warcs = filter(lambda x: 'name' in x and x['name'].endswith and x['name'].endswith('arc.gz'), md['files']) - collectionName = metadata.get('archiveit-collection-name', '') + collectionName = md.get('archiveit-collection-name', '') for ii, ff in enumerate(warcs): #if not ff['name'].endswith('arc.gz'): continue itemMetadata = {'mtime':ff['mtime']} diff --git a/script/inject/monitor.py b/script/inject/monitor.py index ee36a444..38400243 100644 --- a/script/inject/monitor.py +++ b/script/inject/monitor.py @@ -28,8 +28,8 @@ class ItemsNamespace(BaseNamespace, BroadcastMixin): @staticmethod def sendItems(): while True: - if len(ItemsNamespace.AllConnected) == 0: - return + # if len(ItemsNamespace.AllConnected) == 0: + # return item = itemEvent.get() for x in ItemsNamespace.AllConnected: x.emit('update', item) diff --git a/script/warc-inject b/script/warc-inject index 73a195c4..0108db6c 100755 Binary files a/script/warc-inject and b/script/warc-inject differ