Merge branch 'master' into fix-solr-document

Classes/Common/Doc.php

@@ -30,7 +30,6 @@
  * @access public
  * @property int $cPid This holds the PID for the configuration
  * @property-read bool $hasFulltext Are there any fulltext files available?
- * @property-read string $location This holds the documents location
  * @property-read array $metadataArray This holds the documents' parsed metadata array
  * @property-read int $numPages The holds the total number of pages
  * @property-read int $parentId This holds the UID of the parent document or zero if not multi-volumed
@@ -412,7 +411,7 @@ public static function &getInstance($location, $settings = [], $forceReload = fa
         $xml = null;
         $iiif = null;
 
-        if ($instance = self::getDocCache($location)) {
+        if ($instance = self::getDocCache($location) && !$forceReload) {
             return $instance;
         } else {
             $instance = null;
@@ -953,18 +952,6 @@ protected function _getHasFulltext()
         return $this->hasFulltext;
     }
 
-    /**
-     * This returns $this->location via __get()
-     *
-     * @access protected
-     *
-     * @return string The location of the document
-     */
-    protected function _getLocation()
-    {
-        return $this->location;
-    }
-
     /**
      * Format specific part of building the document's metadata array
      *
@@ -1165,18 +1152,6 @@ protected abstract function _getThumbnail($forceReload = false);
      */
     protected abstract function _getToplevelId();
 
-    /**
-     * This returns $this->uid via __get()
-     *
-     * @access protected
-     *
-     * @return mixed The UID or the URL of the document
-     */
-    protected function _getUid()
-    {
-        return $this->uid;
-    }
-
     /**
      * This sets $this->cPid via __set()
      *