Fix for large journals.

Author: Ole Liabø

formats/nha-sip.conf

@@ -49,3 +49,6 @@ INFOVIEW_AUTO_IMPORT_REGEXP_NN=filename[^.*avlxml\\.xml$]
 INFOVIEW_FOLDER_TYPE_REGEXP_EN=reportsFolder
 INFOVIEW_FOLDER_TYPE_REGEXP_NB=rapportMappe
 INFOVIEW_FOLDER_TYPE_REGEXP_NN=rapportMappe
+
+; Auto collapse nodes will be collapsed when importing XML
+TREEVIEW_AUTO_COLLAPSE_REGEXP=derivater@objekter@metadata

pdf/combine-pdfs.cmd

@@ -0,0 +1,18 @@
+@echo off
+
+setlocal EnableDelayedExpansion
+
+set FOLDER=%1
+set FILES=%2
+set OUT=%3
+set convertlog=%4
+
+pushd %FOLDER%
+pdftk %FILES% cat output %OUT% >> %convertlog%
+if not %ERRORLEVEL% equ 0 (
+    echo ERROR executing pdftk %FILES% cat output %OUT% >> %convertlog%
+    exit /b 1
+)
+popd
+
+endlocal

pdf/create-pdf.cmd

@@ -47,7 +47,9 @@ if not exist %HOCR_SCRIPT% (
 )
 
 
+del /q %temp%\journal_*pdf
 set output=%temp%\journal_%timestamp%
+
 set pdffiles=%temp%\journal_pages_%timestamp%.txt
 set n=0
 FOR /F "tokens=1,2 delims=;" %%i in (%files%) do (
@@ -62,9 +64,9 @@ FOR /F "tokens=1,2 delims=;" %%i in (%files%) do (
     set /A n+=1   
 )
 
-pdftk %pdfs% output %out%
+call combine-pdfs.cmd %temp% journal_%timestamp%_*.pdf %out% %convertlog%
 if not %ERRORLEVEL% equ 0 (
-    echo ERROR executing pdftk %pdfs% output %out% >> %convertlog%
+    echo ERROR executing combine-pdfs.cmd %temp% journal_%timestamp%_*.pdf %out% >> %convertlog%
     exit /b 1
 )
 endlocal

src/gui/dinsightmainwindow.cpp

@@ -620,9 +620,10 @@ void DInsightMainWindow::importFileFinished( bool ok )
         infoMessage = tr("Import complete!");
     }
 
-    if ( m_CurrentImport->GetReportFormat()->autoCollapseRegExp().size() )
+    const DImportFormat* format = m_ImportFormats->find( m_CurrentImport->formatName() );
+    if ( format->autoCollapseRegExp().size() )
     {
-        m_Ui.treeView->collapseRecursive( m_CurrentImport->root(), m_CurrentImport->GetReportFormat()->autoCollapseRegExp() );
+        m_Ui.treeView->collapseRecursive( m_CurrentImport->root(), format->autoCollapseRegExp() );
     }
     else
     {

src/main.cpp

@@ -251,8 +251,11 @@ int  main( int argc, char* argv[] )
         window.importFile( parser.value( fileOption ), parser.value( fileFormatOption ), parser.value( autoExportOption ) );
     }
 
-    // Start GUI
-    window.show();
+    if ( !parser.isSet( autoExportOption ) )
+    {
+        // Start GUI
+        window.show();
+    }
 
     return qtApp.exec();
 }