fossology · mcjaeger · Oct 13, 2017 · Sep 12, 2017 · Mar 22, 2016 · Apr 13, 2016
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,8 @@ VERSION
 *~
 /src/vendor
 .vagrant/
+*.orig
+.#*
 
 # compiled or derived files
 install/db/dbcreate
@@ -127,9 +129,12 @@ variable.list
 /src/copyright/agent/ecc
 /src/copyright/VERSION-ecc
 /src/copyright/VERSION-copyright
-/src/spdx2/agent_tests/Functional/spdx-tools-2.0.2-jar-with-dependencies.jar
+/src/spdx2/agent_tests/Functional/spdx-tools-2.0.2-jar-with-dependencies.jar*
 /src/spdx2/agent/version.php
 /src/spdx2/agent/spdx2
+src/reportImport/agent/spdx2Import
+src/reportImport/agent/version.php
+src/reportImport/agent/reportImport
 /src/ninka/agent_tests/Functional/ninka
 /src/ninka/agent_tests/Unit/test_ninka
 /src/ninka/agent/ninka

diff --git a/debian/control b/debian/control
@@ -21,7 +21,7 @@ Description: architecture for analyzing software, development utils
 Package: fossology
 Architecture: any
 Depends: fossology-web, fossology-scheduler, fossology-ununpack, fossology-copyright, fossology-buckets, fossology-mimetype, fossology-delagent, fossology-wgetagent, ${misc:Depends}
-Recommends: fossology-monk, fossology-monkbulk, fossology-decider, fossology-readmeoss, fossology-spdx2, fossology-reuser, fossology-ninka
+Recommends: fossology-monk, fossology-monkbulk, fossology-decider, fossology-readmeoss, fossology-spdx2, fossology-reportimport, fossology-reuser, fossology-ninka
 Conflicts: fossology-db (<= 1.4.1), fossology-common (<= 1.4.1)
 Description: open and modular architecture for analyzing software
  The FOSSology project is a web based framework that allows you to
@@ -295,3 +295,15 @@ Description: architecture for analyzing software, SPDX v2.0 generator
  type identification.
  .
  This package contains the spdx2 agent programs and their resources.
+
+Package: fossology-reportimport
+Architecture: any
+Depends: fossology-common, ${misc:Depends}
+Description: architecture for analyzing software, report importer
+ The FOSSology project is a web based framework that allows you to
+ upload software to be picked apart and then analyzed by software agents
+ which produce results that are then browsable via the web interface.
+ Existing agents include license analysis, metadata extraction, and MIME
+ type identification.
+ .
+ This package contains the reportImport agent programs and their resources.
diff --git a/debian/rules b/debian/rules
@@ -157,7 +157,7 @@ install-arch:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/fossology-readmeoss \
            PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
            -C src/readmeoss install
-	
+
 	$(MAKE) DESTDIR=$(CURDIR)/debian/fossology-reuser \
            PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
            -C src/reuser install
@@ -166,6 +166,10 @@ install-arch:
            PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
            -C src/spdx2 install
 
+	$(MAKE) DESTDIR=$(CURDIR)/debian/fossology-reportimport \
+           PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
+           -C src/reportImport install
+
 	mkdir -p $(CURDIR)/debian/fossology-dev/usr/bin
 	cp $(shell which composer) $(CURDIR)/debian/fossology-dev/usr/bin
 	mkdir -p $(CURDIR)/debian/fossology-dev/usr/share/fossology/

diff --git a/install/db/Makefile b/install/db/Makefile
@@ -27,6 +27,7 @@ install: all
 	$(INSTALL_DATA) sanity_check.php $(DESTDIR)$(LIBEXECDIR)/sanity_check.php
 	$(INSTALL_DATA) fo_mapping_license.php $(DESTDIR)$(LIBEXECDIR)/fo_mapping_license.php
 	$(INSTALL_DATA) dbmigrate_copyright-author.php $(DESTDIR)$(LIBEXECDIR)/dbmigrate_copyright-author.php
+	$(INSTALL_DATA) dbmigrate_multiple_copyright_decisions.php $(DESTDIR)$(LIBEXECDIR)/dbmigrate_multiple_copyright_decisions.php
 
 	$(INSTALL_PROGRAM) export_license_ref.php $(DESTDIR)$(LIBEXECDIR)/export_license_ref.php
 	$(INSTALL_PROGRAM) dbcreate $(DESTDIR)$(LIBEXECDIR)/dbcreate
@@ -55,6 +56,7 @@ uninstall:
 	rm -f $(DESTDIR)$(LIBEXECDIR)/export_license_ref.php
 	rm -f $(DESTDIR)$(LIBEXECDIR)/fo_mapping_license.php
 	rm -f $(DESTDIR)$(LIBEXECDIR)/dbmigrate_copyright-author.php
+	rm -f $(DESTDIR)$(LIBEXECDIR)/dbmigrate_multiple_copyright_decisions.php
 
 	@if [ -d $(DESTDIR)$(LIBEXECDIR) ]; then \
 		if [ "`ls -A $(DESTDIR)$(LIBEXECDIR)`" ]; then \

diff --git a/install/db/dbmigrate_multiple_copyright_decisions.php b/install/db/dbmigrate_multiple_copyright_decisions.php
@@ -0,0 +1,51 @@
+<?php
+/***********************************************************
+Copyright (C) 2017 Siemens AG
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ ***********************************************************/
+
+
+/**
+ * \brief add a new column `is_enabled` to decisions
+ * this is by default false except for the most recent decision which is active
+ */
+
+function addBooleanColumnTo($dbManager, $tableName, $columnName = 'is_enabled')
+{
+  echo "Migrate: Add and setup column=$columnName to table=$tableName\n";
+  if (! $dbManager->existsColumn($tableName, $columnName))
+  {
+    $dbManager->queryOnce("ALTER TABLE $tableName
+                             ADD COLUMN $columnName BOOLEAN;");
+  }
+
+  $dbManager->queryOnce("UPDATE $tableName
+                           SET $columnName = copyright_decision_pk IN
+                             (SELECT MAX(copyright_decision_pk) AS enabled_pk
+                                FROM $tableName
+                                GROUP BY pfile_fk);");
+  $dbManager->queryOnce("ALTER TABLE $tableName
+                           ALTER COLUMN $columnName
+                             SET NOT NULL;");
+  $dbManager->queryOnce("ALTER TABLE $tableName
+                           ALTER COLUMN $columnName
+                             SET DEFAULT TRUE;");
+}
+
+foreach (array('copyright','ecc') as $name)
+{
+  /* @var $dbManager DbManager */
+  addBooleanColumnTo($dbManager, $name.'_decision');
+}
diff --git a/install/fossinit.php b/install/fossinit.php
@@ -191,7 +191,7 @@ function explainUsage()
 }
 
 /* initialize the license_ref table */
-if ($UpdateLiceneseRef) 
+if ($UpdateLiceneseRef)
 {
   $row = $dbManager->getSingleRow("SELECT count(*) FROM license_ref",array(),'license_ref.count');
   if ($row['count'] >  0) {
@@ -337,6 +337,13 @@ function explainUsage()
   $sysconfig['Release'] = "3.0.2";
 }
 
+if($isUpdating && (empty($sysconfig['Release']) || $sysconfig['Release'] == '3.0.2'))
+{
+  require_once("$LIBEXECDIR/dbmigrate_multiple_copyright_decisions.php");
+
+  $sysconfig['Release'] = "3.1.0";
+}
+
 $dbManager->begin();
 $dbManager->getSingleRow("DELETE FROM sysconfig WHERE variablename=$1",array('Release'),$sqlLog='drop.sysconfig.release');
 $dbManager->insertTableRow('sysconfig',
@@ -378,20 +385,20 @@ function initLicenseRefTable($Verbose)
     print "FATAL: Unable to access '$LIBEXECDIR'.\n";
     return (1);
   }
-  
+
   $dbManager->queryOnce("BEGIN");
   $dbManager->queryOnce("DROP TABLE IF EXISTS license_ref_2",$stmt=__METHOD__.'.dropAncientBackUp');
   /* create a new temp table structure only - license_ref_2 */
   $dbManager->queryOnce("CREATE TABLE license_ref_2 as select * from license_ref WHERE 1=2",$stmt=__METHOD__.'.backUpData');
 
-  /** import licenseref.sql */  
+  /** import licenseref.sql */
   $sqlstmts = file_get_contents("$LIBEXECDIR/licenseref.sql");
   $sqlstmts = str_replace("license_ref","license_ref_2", $sqlstmts);
   $dbManager->queryOnce($sqlstmts);
-  
+
   $dbManager->prepare(__METHOD__.".newLic", "select * from license_ref_2");
   $result_new = $dbManager->execute(__METHOD__.".newLic");
-  
+
   $dbManager->prepare(__METHOD__.'.licenseRefByShortname','SELECT * from license_ref where rf_shortname=$1');
   /** traverse all records in user's license_ref table, update or insert */
   while ($row = pg_fetch_assoc($result_new))

diff --git a/install/scripts/install-spdx-tools.sh b/install/scripts/install-spdx-tools.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-wget https://github.com/spdx/tools/releases/download/V2.0.2/spdx-tools-2.0.2-jar-with-dependencies.jar -P $(dirname $0)/../../src/spdx2/agent_tests/Functional/
+wget -nc https://github.com/spdx/tools/releases/download/V2.0.2/spdx-tools-2.0.2-jar-with-dependencies.jar -P $(dirname $0)/../../src/spdx2/agent_tests/Functional/
diff --git a/src/Makefile b/src/Makefile
@@ -28,6 +28,7 @@ DIRS = \
 	reuser \
 	scheduler \
 	spdx2 \
+	reportImport \
 	ununpack \
 	wget_agent \
 	www

diff --git a/src/composer.json b/src/composer.json
@@ -15,7 +15,8 @@
         "symfony/http-foundation": "2.6.*",
         "symfony/dependency-injection": "2.6.*",
         "twig/twig": "1.*",
-        "twig/extensions": "1.*"
+        "twig/extensions": "1.*",
+        "easyrdf/easyrdf": "0.9.*"
     },
 
     "require-dev": {