Subversion Repositories cheapmusic

Rev

Rev 149 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 149 Rev 150
Line 10... Line 10...
10 
    $_SESSION["discogs"] = "";
 10 
    $_SESSION["discogs"] = "";
11 
    $stxt = $_SESSION["searchTerm"];
 11 
    $stxt = $_SESSION["searchTerm"];
12 
 
 12 
 
13 
    $params = [];
 13 
    $params = [];
14 
    $params["token"] = $config['token'];
 14 
    $params["token"] = $config['token'];
15 
    $params["type"] = "All";
 15 
    $params["type"] = "master";
16 
 
 16 
 
17 
    if (!empty($_SESSION["advSearch"])) {
 17 
    if (!empty($_SESSION["advSearch"])) {
18 
        $stxt = '';
 18 
        $stxt = '';
19 
        if (!empty($_SESSION["advSearch"]["Title"])) {
 19 
        if (!empty($_SESSION["advSearch"]["Title"])) {
20 
            $params["release_title"] = $_SESSION["advSearch"]["Title"];
 20 
            $params["release_title"] = $_SESSION["advSearch"]["Title"];
Line 25... Line 25...
25 
            $stxt .= $_SESSION["advSearch"]["Artist"];
 25 
            $stxt .= $_SESSION["advSearch"]["Artist"];
26 
        }
 26 
        }
27 
        if (!empty($_SESSION["advSearch"]["Track"])) {
 27 
        if (!empty($_SESSION["advSearch"]["Track"])) {
28 
            $params["track"] = $_SESSION["advSearch"]["Track"];
 28 
            $params["track"] = $_SESSION["advSearch"]["Track"];
29 
            $stxt .= $_SESSION["advSearch"]["Track"];
 29 
            $stxt .= $_SESSION["advSearch"]["Track"];
- 
 
 30 
            $params["type"] = "release";
30 
        }
 31 
        }
31 
        if (!empty($_SESSION["advSearch"]["Barcode"])) {
 32 
        if (!empty($_SESSION["advSearch"]["Barcode"])) {
32 
            $params["barcode"] = $_SESSION["advSearch"]["Barcode"];
 33 
            $params["barcode"] = $_SESSION["advSearch"]["Barcode"];
33 
            $stxt .= $_SESSION["advSearch"]["Barcode"];
 34 
            $stxt .= $_SESSION["advSearch"]["Barcode"];
- 
 
 35 
            $params["type"] = "release";
34 
        }
 36 
        }
35 
        if (!empty($_SESSION["advSearch"]["Format"])) {
 37 
        if (!empty($_SESSION["advSearch"]["Format"])) {
36 
            $params["format"] = $_SESSION["advSearch"]["Format"];
 38 
            $params["format"] = $_SESSION["advSearch"]["Format"];
37 
            $stxt .= $_SESSION["advSearch"]["Format"];
 39 
            $stxt .= $_SESSION["advSearch"]["Format"];
- 
 
 40 
            $params["type"] = "release";
38 
        }
 41 
        }
39 
        if (!empty($_SESSION["advSearch"]["Catno"])) {
 42 
        if (!empty($_SESSION["advSearch"]["Catno"])) {
40 
            $params["catno"] = $_SESSION["advSearch"]["Catno"];
 43 
            $params["catno"] = $_SESSION["advSearch"]["Catno"];
41 
            $stxt .= $_SESSION["advSearch"]["Catno"];
 44 
            $stxt .= $_SESSION["advSearch"]["Catno"];
- 
 
 45 
            $params["type"] = "release";
42 
        }
 46 
        }
43 
        if (!empty($_SESSION["advSearch"]["Label"])) {
 47 
        if (!empty($_SESSION["advSearch"]["Label"])) {
44 
            $params["label"] = $_SESSION["advSearch"]["Label"];
 48 
            $params["label"] = $_SESSION["advSearch"]["Label"];
45 
            $stxt .= $_SESSION["advSearch"]["Label"];
 49 
            $stxt .= $_SESSION["advSearch"]["Label"];
46 
        }
 50 
        }
47 
        if (!empty($_SESSION["advSearch"]["Country"])) {
 51 
        if (!empty($_SESSION["advSearch"]["Country"])) {
48 
            $params["country"] = $_SESSION["advSearch"]["Country"];
 52 
            $params["country"] = $_SESSION["advSearch"]["Country"];
49 
            $stxt .= $_SESSION["advSearch"]["Country"];
 53 
            $stxt .= $_SESSION["advSearch"]["Country"];
- 
 
 54 
            $params["type"] = "release";
50 
        }
 55 
        }
51 
        if (!empty($_SESSION["advSearch"]["Year"])) {
 56 
        if (!empty($_SESSION["advSearch"]["Year"])) {
52 
            $params["year"] = $_SESSION["advSearch"]["Year"];
 57 
            $params["year"] = $_SESSION["advSearch"]["Year"];
53 
            $stxt .= $_SESSION["advSearch"]["Year"];
 58 
            $stxt .= $_SESSION["advSearch"]["Year"];
54 
        }
 59 
        }
Line 136... Line 141...
136 
    $processedMasters = [];
 141 
    $processedMasters = [];
137 
    $extraMasters = [];
 142 
    $extraMasters = [];
138 
    $searchUrls = [];
 143 
    $searchUrls = [];
139 
    $masterResps_cache = [];
 144 
    $masterResps_cache = [];
140 
    foreach ($searchResp->{'results'} as $searchey => $searchValue) {
 145 
    foreach ($searchResp->{'results'} as $searchey => $searchValue) {
141 
// bugbug foreach ($searchResp->{'releases'} as $searchey => $searchValue) {
 - 
 
142 
        if (!in_array($searchValue->{'type'}, array("master", "release")) && (empty($_SESSION["advSearch"]["Barcode"]))) {
 146 
        if (!in_array($searchValue->{'type'}, array("master", "release")) && (empty($_SESSION["advSearch"]["Barcode"]))) {
143 
            continue;
 147 
            continue;
144 
        }
 148 
        }
145 
 
 149 
 
146 
        if (empty($_SESSION["advSearch"]["Barcode"]) && $searchValue->{'type'} == "release" && $searchValue->{'master_id'} > 0) {
 150 
        if (empty($_SESSION["advSearch"]["Barcode"]) && $searchValue->{'type'} == "release" && $searchValue->{'master_id'} > 0) {