fix /origin/<pid> to get correct 1 pkg

1 files changed, 15 insertions, 9 deletions

diff --git a/index.php b/index.php
index 31b6ff6..39a2b94 100644
--- a/index.php
+++ b/index.php
@@ -565,7 +565,8 @@ $app->get(
         $id = $res->fid;
     }
 
-    if($id) { $app->handle("/$type/$subtype/$id"); } else { $app->handle('/404'); }
+    if($id) { $app->handle("/$type/$subtype/$id"); return; }
+    $app->handle('/404');
 
 });
 
@@ -624,6 +625,19 @@ $app->get(
 
 });
 
+
+//Retrieves parent package (pkg that Packages->id is subpage of)
+$app->get('/origins/pid/{pid:[0-9]+}', function($pid) use ($app) {
+    $res = Packages::findFirst( array( "id = '$pid'", 'limit' => 1 ) );
+    if( ! $res->id) { $app->handle('/404'); return; }
+    $origin = $res->origin;
+    $filtr = ['branch', 'repo', 'arch']; $filter = array();
+    foreach($filtr as $v) $filter[] = $v.'/'.$res->$v;
+    $f = implode('/', $filter);
+    $app->handle("/search/packages/name/$origin/$f");
+});
+
+
 // Retrieves packages by flagged-id
 $app->get('/packages/fid/{fid:[0-9]+}', function($fid) use ($app) {
     $data = initJapiData($app, 'packages');
@@ -694,14 +708,6 @@ $app->get('/packages/flagged', function() use ($app) {
     if($data) json_api_encode($data, $app);
 });
 
-
-$app->get('/origins/pid/{pid:[0-9]+}', function($pid) use ($app) {
-    $res = Packages::findFirst( array( "id = '$pid'", 'limit' => 1 ) );
-    $origin = $res->origin;
-    $app->handle("/packages/name/$origin"); return;
-});
-
-
 $app->get('/flagged/{filters:.*}', function($filters) use ($app) {
     $data = initJapiData($app, 'flagged');
     $cols = 'fid, created, reporter, new_version, message';