sphinx 0.9.10.2122 → 2.1.1.3711

data/spec/fixtures/{keywords.php → requests/php/keywords.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->BuildKeywords('test', 'index', true);

data/spec/fixtures/{limits.php → requests/php/limits.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetLimits(10, 20);

data/spec/fixtures/{limits_cutoff.php → requests/php/limits_cutoff.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetLimits(10, 20, 30, 40);

data/spec/fixtures/{limits_max.php → requests/php/limits_max.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetLimits(10, 20, 30);

data/spec/fixtures/{limits_max_cutoff.php → requests/php/limits_max_cutoff.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetLimits(10, 20, 30, 40);

data/spec/fixtures/{match_all.php → requests/php/match_all.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_ALL);

data/spec/fixtures/{match_any.php → requests/php/match_any.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_ANY);

data/spec/fixtures/{match_boolean.php → requests/php/match_boolean.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_BOOLEAN);

data/spec/fixtures/{match_extended.php → requests/php/match_extended.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_EXTENDED);

data/spec/fixtures/{match_extended2.php → requests/php/match_extended2.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_EXTENDED2);

data/spec/fixtures/{match_fullscan.php → requests/php/match_fullscan.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_FULLSCAN);

data/spec/fixtures/{match_phrase.php → requests/php/match_phrase.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMatchMode(SPH_MATCH_PHRASE);

data/spec/fixtures/{max_query_time.php → requests/php/max_query_time.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetMaxQueryTime(1000);

data/spec/fixtures/{miltiple_queries.php → requests/php/miltiple_queries.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRetries(10, 20);

data/spec/fixtures/requests/php/outer_select.php

@@ -0,0 +1,9 @@
+<?php
+
+require ("spec/fixtures/sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->SetOuterSelect('attr', 10, 100);
+$cl->Query('query');
+
+?>

data/spec/fixtures/{set_override.php → requests/php/override.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetOverride('attr1', SPH_ATTR_INTEGER, array(10 => 20));

data/spec/fixtures/requests/php/query_flag.php

@@ -0,0 +1,13 @@
+<?php
+
+require ("spec/fixtures/sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->SetQueryFlag('reverse_scan', 1);
+$cl->SetQueryFlag('sort_method', 'kbuffer');
+$cl->SetQueryFlag('max_predicted_time', 15);
+$cl->SetQueryFlag('boolean_simplify', true);
+$cl->SetQueryFlag('idf', 'plain');
+$cl->Query('query');
+
+?>

data/spec/fixtures/requests/php/query_flag_after_reset.php

@@ -0,0 +1,19 @@
+<?php
+
+require ("spec/fixtures/sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->SetQueryFlag('reverse_scan', 1);
+$cl->SetQueryFlag('sort_method', 'kbuffer');
+$cl->SetQueryFlag('max_predicted_time', 15);
+$cl->SetQueryFlag('boolean_simplify', true);
+$cl->SetQueryFlag('idf', 'plain');
+
+$cl->SetQueryFlag('reverse_scan', 0);
+$cl->SetQueryFlag('sort_method', 'pq');
+$cl->SetQueryFlag('max_predicted_time', 0);
+$cl->SetQueryFlag('boolean_simplify', false);
+$cl->SetQueryFlag('idf', 'normalized');
+$cl->Query('query');
+
+?>

data/spec/fixtures/{ranking_bm25.php → requests/php/ranking_bm25.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_BM25);

data/spec/fixtures/requests/php/ranking_expr.php

@@ -0,0 +1,9 @@
+<?php
+
+require ("spec/fixtures/sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->SetRankingMode(SPH_RANK_EXPR, 'sum(lcs*user_weight)*1000+bm25');
+$cl->Query('query');
+
+?>

data/spec/fixtures/{ranking_fieldmask.php → requests/php/ranking_fieldmask.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_FIELDMASK);

data/spec/fixtures/{ranking_matchany.php → requests/php/ranking_matchany.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_MATCHANY);

data/spec/fixtures/{ranking_none.php → requests/php/ranking_none.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_NONE);

data/spec/fixtures/{ranking_proximity.php → requests/php/ranking_proximity.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_PROXIMITY);

data/spec/fixtures/{ranking_proximity_bm25.php → requests/php/ranking_proximity_bm25.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_PROXIMITY_BM25);

data/spec/fixtures/{ranking_sph04.php → requests/php/ranking_sph04.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_SPH04);

data/spec/fixtures/{ranking_wordcount.php → requests/php/ranking_wordcount.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRankingMode(SPH_RANK_WORDCOUNT);

data/spec/fixtures/{retries.php → requests/php/retries.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRetries(10);

data/spec/fixtures/{retries_delay.php → requests/php/retries_delay.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetRetries(10, 20);

data/spec/fixtures/{select.php → requests/php/select.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSelect('attr1, attr2');

data/spec/fixtures/{sort_attr_asc.php → requests/php/sort_attr_asc.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSortMode(SPH_SORT_ATTR_ASC, 'sortby');

data/spec/fixtures/{sort_attr_desc.php → requests/php/sort_attr_desc.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSortMode(SPH_SORT_ATTR_DESC, 'sortby');

data/spec/fixtures/{sort_expr.php → requests/php/sort_expr.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSortMode(SPH_SORT_EXPR, 'sortby');

data/spec/fixtures/{sort_extended.php → requests/php/sort_extended.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSortMode(SPH_SORT_EXTENDED, 'sortby');

data/spec/fixtures/{sort_relevance.php → requests/php/sort_relevance.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSortMode(SPH_SORT_RELEVANCE);

data/spec/fixtures/{sort_time_segments.php → requests/php/sort_time_segments.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetSortMode(SPH_SORT_TIME_SEGMENTS, 'sortby');

data/spec/fixtures/{update_attributes.php → requests/php/update_attributes.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->UpdateAttributes('index', array('group'), array(123 => array(456)));

data/spec/fixtures/{update_attributes_mva.php → requests/php/update_attributes_mva.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->UpdateAttributes('index', array('group', 'category'), array(123 => array(array(456, 789), array(1, 2, 3))), true);

data/spec/fixtures/{weights.php → requests/php/weights.php}

@@ -1,6 +1,6 @@
 <?php
 
-require ("sphinxapi.php");
+require ("spec/fixtures/sphinxapi.php");
 
 $cl = new SphinxClient();
 $cl->SetWeights(array(10, 20, 30, 40));

data/spec/fixtures/responses/flush_attrs.dat

@@ -0,0 +1,2 @@
+
+Fatal error: Call to undefined method SphinxClient::FlushAttrs() in /work/sphinx/sphinx.git/spec/fixtures/responses/php/flush_attrs.php on line 6

data/spec/fixtures/responses/php/build_excerpts.php

@@ -0,0 +1,8 @@
+<?php
+
+require ("spec/fixtures/sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->BuildExcerpts(array('what the world', 'London is the capital of Great Britain'), 'test1', 'the');
+
+?>

data/spec/fixtures/responses/php/build_keywords.php

@@ -0,0 +1,8 @@
+<?php
+
+require ("spec/fixtures/sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->BuildKeywords('wifi gprs', 'test1', true);
+
+?>