From 19d96e4596286d722b8e739dd5fa8e0c7aa42859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lahmann?= <lahmann@ub.uni-leipzig.de>
Date: Thu, 27 Nov 2014 16:22:52 +0100
Subject: [PATCH] added copyright info and updated logger-integration

---
 module/finc/src/finc/RecordDriver/Factory.php |  8 ++---
 .../src/finc/RecordDriver/SolrMarcLite.php    | 29 +++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/module/finc/src/finc/RecordDriver/Factory.php b/module/finc/src/finc/RecordDriver/Factory.php
index f7cff54e718..0327eda6428 100644
--- a/module/finc/src/finc/RecordDriver/Factory.php
+++ b/module/finc/src/finc/RecordDriver/Factory.php
@@ -4,7 +4,7 @@
  *
  * PHP version 5
  *
- * Copyright (C) Villanova University 2014.
+ * Copyright (C) Leipzig University Library 2014.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -21,9 +21,9 @@
  *
  * @category VuFind2
  * @package  RecordDrivers
- * @author   Demian Katz <demian.katz@villanova.edu>
+ * @author   André Lahmann <lahmann@ub.uni-leipzig.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ * @link     http://vufind.org/wiki/vufind2
  */
 namespace finc\RecordDriver;
 use Zend\ServiceManager\ServiceManager;
@@ -35,7 +35,7 @@ use Zend\ServiceManager\ServiceManager;
  * @package  RecordDrivers
  * @author   André Lahmann <lahmann@ub.uni-leipzig.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link     http://vufind.org/wiki/vufind2:hierarchy_components Wiki
+ * @link     http://vufind.org/wiki/vufind2
  * @codeCoverageIgnore
  */
 class Factory extends \VuFind\RecordDriver\Factory
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcLite.php b/module/finc/src/finc/RecordDriver/SolrMarcLite.php
index 0a5daa9efb6..eee59684735 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcLite.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcLite.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * Model for MARC records in Solr.
+ * Model for MARC records without a fullrecord in Solr. The fullrecord is being
+ * retrieved from an external source.
  *
  * PHP version 5
  *
- * Copyright (C) Villanova University 2010.
+ * Copyright (C) Leipzig University Library 2014.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -21,12 +22,12 @@
  *
  * @category VuFind2
  * @package  RecordDrivers
- * @author   Demian Katz <demian.katz@villanova.edu>
+ * @author   André Lahmann <lahmann@ub.uni-leipzig.de>, Ulf Seltmann <seltmann@ub.uni-leipzig.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
 namespace finc\RecordDriver;
-use VuFind\Log\Logger;
+use \Zend\Log\LoggerInterface;
 
 /**
  * Model for MARC records without a fullrecord in Solr. The fullrecord is being
@@ -38,14 +39,14 @@ use VuFind\Log\Logger;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/vufind2:record_drivers Wiki
  */
-class SolrMarcLite extends \VuFind\RecordDriver\SolrMarc
+class SolrMarcLite extends \VuFind\RecordDriver\SolrMarc implements \Zend\Log\LoggerAwareInterface
 {
     /**
-     * Logger.
+     * Logger (or false for none)
      *
-     * @var VuFind\Log\Logger
+     * @var LoggerInterface|bool
      */
-    protected $logger;
+    protected $logger = false;
 
     /**
      * MARC record
@@ -75,10 +76,6 @@ class SolrMarcLite extends \VuFind\RecordDriver\SolrMarc
     ) {
         parent::__construct($mainConfig, $recordConfig, $searchSettings);
 
-        $this->logger = new Logger();
-
-        $this->setLogger($this->logger);
-
         if (!isset($mainConfig->Index)) {
             throw new \Exception('index setting missing.');
         }
@@ -207,13 +204,13 @@ class SolrMarcLite extends \VuFind\RecordDriver\SolrMarc
     }
 
     /**
-     * Set the Logger.
+     * Set the logger
      *
-     * @param VuFind\Log\Logger $logger
+     * @param LoggerInterface $logger Logger to use.
      *
      * @return void
      */
-    protected function setLogger(Logger $logger)
+    public function setLogger(LoggerInterface $logger)
     {
         $this->logger = $logger;
     }
@@ -228,7 +225,7 @@ class SolrMarcLite extends \VuFind\RecordDriver\SolrMarc
     protected function debug($msg)
     {
         if ($this->logger) {
-            $this->logger->debug($msg);
+            $this->logger->debug(get_class($this) . ": $msg");
         }
     }
 }
-- 
GitLab