scriptotek / colligator-backend

app/Console/Commands/OaiPmhHarvest.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
         $this->comment('Available configurations:');
         $config = \Config::get('oaipmh.harvests', null);
         foreach (array_keys($config) as $key) {
-            $this->comment(' - ' . $key);
+            $this->comment(' - '.$key);
         }
     }
 
@@ -80,7 +80,7 @@ 
 
             return false;
         }
-        $harvestConfig = \Config::get('oaipmh.harvests.' . $this->argument('name'), null);
+        $harvestConfig = \Config::get('oaipmh.harvests.'.$this->argument('name'), null);
         if (is_null($harvestConfig)) {
             $this->error('Unknown configuration specified.');
             $this->listConfigurations();
@@ -129,7 +129,7 @@ 
         }
 
         $harvestName = $this->argument('name');
-        $harvestConfig = \Config::get('oaipmh.harvests.' . $harvestName, null);
+        $harvestConfig = \Config::get('oaipmh.harvests.'.$harvestName, null);
 
         $this->comment('');
         $this->info(sprintf('[%s] Starting harvest "%s"',
@@ -140,9 +140,9 @@ 
         if ($this->option('from-dump')) {
             $this->comment(' - From local dump');
         } else {
-            $this->comment(' - Repo: ' . $harvestConfig['url']);
-            $this->comment(' - Schema: ' . $harvestConfig['schema']);
-            $this->comment(' - Set: ' . $harvestConfig['set']);
+            $this->comment(' - Repo: '.$harvestConfig['url']);
+            $this->comment(' - Schema: '.$harvestConfig['schema']);
+            $this->comment(' - Set: '.$harvestConfig['set']);
 
             foreach (['from', 'until', 'resume', 'daily'] as $key) {
                 if (!is_null($this->option($key))) {
@@ -154,11 +154,11 @@ 
         // For timing
         $this->startTime = $this->batchTime = microtime(true) - 1;
 
-        \Event::listen('Colligator\Events\OaiPmhHarvestStatus', function ($event) {
+        \Event::listen('Colligator\Events\OaiPmhHarvestStatus', function($event) {
             $this->status($event->harvested, $event->position);
         });
 
-        \Event::listen('Colligator\Events\OaiPmhHarvestComplete', function ($event) {
+        \Event::listen('Colligator\Events\OaiPmhHarvestComplete', function($event) {
             $this->info(sprintf('[%s] Harvest complete, got %d records in %d seconds',
                 strftime('%Y-%m-%d %H:%M:%S'),
                 $event->count,
@@ -166,8 +166,8 @@ 
             ));
         });
 
-        \Event::listen('Colligator\Events\JobError', function ($event) {
-            \Log::error('[OaiPmhHarvest] ' . $event->msg);
+        \Event::listen('Colligator\Events\JobError', function($event) {
+            \Log::error('[OaiPmhHarvest] '.$event->msg);
             $this->error($event->msg);
         });
 

app/Marc21Importer.php

Spacing +5 added lines, -5 removed lines

@@ -57,8 +57,8 @@ 
             $rec = MarcRecord::fromString($q);
 
             $itemMap = [
-                'x' => 'location',  // OBS: 1030310
-                'y' => 'shelvinglocation',  // OBS: k00475
+                'x' => 'location', // OBS: 1030310
+                'y' => 'shelvinglocation', // OBS: k00475
                 'c' => 'barcode',
                 'z' => 'callcode',
                 'a' => 'id',
@@ -193,7 +193,7 @@ 
             try {
                 $doc->storeCover($biblio['cover_image']);
             } catch (\ErrorException $e) {
-                \Log::error('Failed to store cover: ' . $biblio['cover_image']);
+                \Log::error('Failed to store cover: '.$biblio['cover_image']);
             }
         }
 
@@ -208,14 +208,14 @@ 
         try {
             list($biblio, $holdings) = $this->parseRecord($record);
         } catch (ParserException $e) {
-            $this->error('Failed to parse MARC record. Error "' . $e->getMessage() . '" in: ' . $e->getFile() . ':' . $e->getLine() . "\nStack trace:\n" . $e->getTraceAsString());
+            $this->error('Failed to parse MARC record. Error "'.$e->getMessage().'" in: '.$e->getFile().':'.$e->getLine()."\nStack trace:\n".$e->getTraceAsString());
 
             return;
         }
 
         $doc = $this->importParsedRecord($biblio, $holdings);
 
-        \Log::debug('[Marc21Importer] Imported ' . $doc->bibsys_id . ' as ' . $doc->id);
+        \Log::debug('[Marc21Importer] Imported '.$doc->bibsys_id.' as '.$doc->id);
 
         if (!is_null($doc)) {
             Event::fire(new Marc21RecordImported($doc->id));

app/Jobs/OaiPmhHarvest.php

Spacing +10 added lines, -10 removed lines

@@ -102,7 +102,7 @@ 
      */
     public function fromDump()
     {
-        $files = Storage::disk('local')->files('harvests/' . $this->name);
+        $files = Storage::disk('local')->files('harvests/'.$this->name);
         $recordsHarvested = 0;
         foreach ($files as $filename) {
             if (!preg_match('/.xml$/', $filename)) {
@@ -124,11 +124,11 @@ 
 
     public function fromNetwork()
     {
-        $dest_path = 'harvests/' . $this->name . '/';
+        $dest_path = 'harvests/'.$this->name.'/';
 
         Storage::disk('local')->deleteDir($dest_path);
 
-        $latest = $dest_path . 'latest.xml';
+        $latest = $dest_path.'latest.xml';
 
         $client = new OaiPmhClient($this->url, [
             'schema'              => $this->schema,
@@ -137,12 +137,12 @@ 
             'sleep-time-on-error' => $this->sleepTimeOnError,
         ]);
 
-        $client->on('request.error', function ($msg) {
+        $client->on('request.error', function($msg) {
             $this->error($msg);
         });
 
         // Store each response to disk just in case
-        $client->on('request.complete', function ($verb, $args, $body) use ($latest) {
+        $client->on('request.complete', function($verb, $args, $body) use ($latest) {
             Storage::disk('local')->put($latest, $body);
         });
 
@@ -166,9 +166,9 @@ 
             if ($this->resume != $records->getResumptionToken()) {
                 $this->resume = $records->getResumptionToken();
                 if (is_null($this->resume)) {
-                    Storage::disk('local')->delete($dest_path . '/resumption_token');
+                    Storage::disk('local')->delete($dest_path.'/resumption_token');
                 } else {
-                    Storage::disk('local')->put($dest_path . '/resumption_token', $this->resume);
+                    Storage::disk('local')->put($dest_path.'/resumption_token', $this->resume);
                 }
             }
 
@@ -201,7 +201,7 @@ 
                 } catch (BadRequestError $e) {
                     $this->error($e->getMessage());
                     $this->error($e->getCode());
-                    $this->error('Bad request. Attempt ' . $attempt . ' of 100. Sleeping 10 secs.');
+                    $this->error('Bad request. Attempt '.$attempt.' of 100. Sleeping 10 secs.');
                     if ($attempt > 100) {
                         throw $e;
                     }
@@ -225,7 +225,7 @@ 
      */
     public function handle(DocumentsIndex $docIndex, Marc21Importer $importer)
     {
-        Log::info('[OaiPmhHarvestJob] Starting job. Requesting records from ' . ($this->start ?: '(no limit)') . ' until ' . ($this->until ?: '(no limit)') . '.');
+        Log::info('[OaiPmhHarvestJob] Starting job. Requesting records from '.($this->start ?: '(no limit)').' until '.($this->until ?: '(no limit)').'.');
         $this->docIndex = $docIndex;
         $this->importer = $importer;
 
@@ -245,7 +245,7 @@ 
         }
 
         // $this->postProcess($this->importedDocuments);
-        Log::info('[OaiPmhHarvestJob] Complete, got ' . $recordsHarvested . ' records.');
+        Log::info('[OaiPmhHarvestJob] Complete, got '.$recordsHarvested.' records.');
 
         Event::fire(new OaiPmhHarvestComplete($recordsHarvested));
     }

app/Search/DocumentsIndex.php

Spacing +18 added lines, -18 removed lines

@@ -94,7 +94,7 @@ 
     public function sanitizeForQuery($value)
     {
         $chars = preg_quote('\\+-&|!(){}[]^~*?:');
-        $value = preg_replace('/([' . $chars . '])/', '\\\\\1', $value);
+        $value = preg_replace('/(['.$chars.'])/', '\\\\\1', $value);
 
         return $value;
         //
@@ -126,17 +126,17 @@ 
         }
         if ($request->has('collection')) {
             $col = Collection::findOrFail($request->collection);
-            $query[] = 'collections:"' . $this->sanitizeForQuery($col->name) . '"';
+            $query[] = 'collections:"'.$this->sanitizeForQuery($col->name).'"';
         }
         if ($request->has('subject')) {
-            $query[] = '(subjects.noubomn.prefLabel:"' . $this->sanitizeForQuery($request->subject) . '"' .
-                    ' OR subjects.NOTrBIB.prefLabel:"' . $this->sanitizeForQuery($request->subject) . '"' .
-                    ' OR genres.noubomn.prefLabel:"' . $this->sanitizeForQuery($request->subject) . '")';
+            $query[] = '(subjects.noubomn.prefLabel:"'.$this->sanitizeForQuery($request->subject).'"'.
+                    ' OR subjects.NOTrBIB.prefLabel:"'.$this->sanitizeForQuery($request->subject).'"'.
+                    ' OR genres.noubomn.prefLabel:"'.$this->sanitizeForQuery($request->subject).'")';
                 // TODO: Vi bør vel antakelig skille mellom X som emne og X som form/sjanger ?
                 //       Men da må frontend si fra hva den ønsker, noe den ikke gjør enda.
         }
         if ($request->has('genre')) {
-            $query[] = 'genres.noubomn.prefLabel:"' . $this->sanitizeForQuery($request->genre) . '"';
+            $query[] = 'genres.noubomn.prefLabel:"'.$this->sanitizeForQuery($request->genre).'"';
         }
         if ($request->has('real')) {
             dd('`real` is (very) deprecated, please use `subject` instead.');
@@ -174,7 +174,7 @@ 
     public function getUsageCount($id, $type)
     {
         $this->getFullType($type);
-        $arg = $type . '.' . $id;
+        $arg = $type.'.'.$id;
         if (is_null(array_get($this->usage, $arg))) {
             $this->addToUsageCache($id, $type);
         }
@@ -203,11 +203,11 @@ 
             ->get();
 
         foreach ($entity_ids as $sid) {
-            array_set($this->usage, $type . '.' . $sid, 0);
+            array_set($this->usage, $type.'.'.$sid, 0);
         }
 
         foreach ($res as $row) {
-            array_set($this->usage, $type . '.' . $row->entity_id, intval($row->doc_count));
+            array_set($this->usage, $type.'.'.$row->entity_id, intval($row->doc_count));
         }
     }
 
@@ -217,10 +217,10 @@ 
         $query = \DB::table('entities')
                     ->select(['entity_id', 'entity_type', \DB::raw('count(document_id) as doc_count')])
                     ->groupBy('entity_id', 'entity_type');
-        $query->chunk(5000, function ($rows) use ($typemap) {
+        $query->chunk(5000, function($rows) use ($typemap) {
             foreach ($rows as $row) {
                 $type = $typemap[$row->entity_type];
-                array_set($this->usage, $type . '.' . $row->entity_id, intval($row->doc_count));
+                array_set($this->usage, $type.'.'.$row->entity_id, intval($row->doc_count));
             }
         });
     }
@@ -237,7 +237,7 @@ 
     {
         $payload = $this->basePayload();
         if (!is_null($indexVersion)) {
-            $payload['index'] = $this->esIndex . '_v' . $indexVersion;
+            $payload['index'] = $this->esIndex.'_v'.$indexVersion;
         }
         $payload['id'] = $doc->id;
 
@@ -247,8 +247,8 @@ 
         try {
             $this->client->index($payload);
         } catch (BadRequest400Exception $e) {
-            \Log::error('ElasticSearch returned error: ' . $e->getMessage() . '. Our request: ' . var_export($payload, true));
-            throw new \ErrorException('ElasticSearch failed to index the document ' . $doc->id . '. Please see the log for payload and full error response. Error message: ' . $e->getMessage());
+            \Log::error('ElasticSearch returned error: '.$e->getMessage().'. Our request: '.var_export($payload, true));
+            throw new \ErrorException('ElasticSearch failed to index the document '.$doc->id.'. Please see the log for payload and full error response. Error message: '.$e->getMessage());
         }
     }
 
@@ -269,7 +269,7 @@ 
         if (is_null($version)) {
             $version = $this->getCurrentVersion() + 1;
         }
-        $indexParams = ['index' => $this->esIndex . '_v' . $version];
+        $indexParams = ['index' => $this->esIndex.'_v'.$version];
         $indexParams['body']['settings']['analysis']['char_filter']['isbn_filter'] = [
             'type'        => 'pattern_replace',
             'pattern'     => '-',
@@ -311,7 +311,7 @@ 
     {
         try {
             $this->client->indices()->delete([
-                'index' => $this->esIndex . '_v' . $version,
+                'index' => $this->esIndex.'_v'.$version,
             ]);
         } catch (Missing404Exception $e) {
             # Didn't exist in the beginning, that's ok.
@@ -321,7 +321,7 @@ 
     public function addAction(&$actions, $action, $version)
     {
         if ($version) {
-            $actions[] = [$action => ['index' => $this->esIndex . '_v' . $version, 'alias' => $this->esIndex]];
+            $actions[] = [$action => ['index' => $this->esIndex.'_v'.$version, 'alias' => $this->esIndex]];
         }
     }
 
@@ -338,7 +338,7 @@ 
 
     public function versionExists($version)
     {
-        return $this->client->indices()->exists(['index' => $this->esIndex . '_v' . $version]);
+        return $this->client->indices()->exists(['index' => $this->esIndex.'_v'.$version]);
     }
 
     public function getCurrentVersion()