Skip to content

Commit

Permalink
add cache headers along with response
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnRDOrazio
JohnRDOrazio committed Feb 6, 2022
1 parent 52c55de commit df7e17d
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 30 deletions.
1 change: 1 addition & 0 deletions includes/APICore.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public function setResponseContentType( string $responseContentType ) : void {
}

public function setResponseContentTypeHeader() : void {
header( 'Cache-Control: must-revalidate, max-age=259200' ); //cache for 1 month
header( "Content-Type: {$this->ResponseContentType}; charset=utf-8" );
}

Expand Down
79 changes: 49 additions & 30 deletions includes/LitCalAPI.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class LitCalAPI {

private ?object $DiocesanData = null;
private ?object $NationalData = null;
private ?object $widerRegionData = null;
private ?object $WiderRegionData = null;
private ?object $GeneralIndex = null;
private NumberFormatter $formatter;
private NumberFormatter $formatterFem;
Expand Down Expand Up @@ -1582,6 +1582,40 @@ private function calculateSaturdayMemorialBVM() : void {
}
}

private function loadNationalCalendarData() : void {
$nationalDataFile = "nations/{$this->LitSettings->NationalCalendar}/{$this->LitSettings->NationalCalendar}.json";
if( file_exists( $nationalDataFile ) ) {
$this->NationalData = json_decode( file_get_contents($nationalDataFile ) );
if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData, "WiderRegion" ) ){
$widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
$widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
if( file_exists( $widerRegionI18nFile ) ) {
$widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
$this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ), true );
if( json_last_error() === JSON_ERROR_NONE ) {
foreach( $this->WiderRegionData as $idx => $value ) {
$tag = $value["Festivity"]["tag"];
$this->WiderRegionData[$idx]["Festivity"]["name"] = $widerRegionI18nData[ $tag ];
}
} else {
$this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
}
} else {
$this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
}
}
}
}
}

private function applyNationalCalendar() : void {
//first thing is apply any wider region festivities, such as Patron Saints of the Wider Region (example: Europe)
if( $this->WiderRegionData !== null ) {

}
}

private function applyCalendarItaly() : void {
$this->applyPatronSaintsEurope();
$this->applyPatronSaintsItaly();
Expand Down Expand Up @@ -2216,33 +2250,6 @@ public function setAllowedReturnTypes( array $returnTypes ) : void {
$this->AllowedReturnTypes = array_values( array_intersect( ReturnType::$values, $returnTypes ) );
}

private function loadNationalCalendarData() : void {
$nationalDataFile = "nations/{$this->LitSettings->NationalCalendar}/{$this->LitSettings->NationalCalendar}.json";
if( file_exists( $nationalDataFile ) ) {
$this->NationalData = json_decode( file_get_contents($nationalDataFile ) );
if( property_exists( $this->NationalData, "Metadata" ) && property_exists( $this->NationalData, "WiderRegion" ) ){
$widerRegionDataFile = $this->NationalData->Metadata->WiderRegion->jsonFile;
$widerRegionI18nFile = $this->NationalData->Metadata->WiderRegion->i18nFile;
if( file_exists( $widerRegionI18nFile ) ) {
$widerRegionI18nData = json_decode( file_get_contents( $widerRegionI18nFile ) );
if( json_last_error() === JSON_ERROR_NONE && file_exists( $widerRegionDataFile ) ) {
$this->WiderRegionData = json_decode( file_get_contents( $widerRegionDataFile ), true );
if( json_last_error() === JSON_ERROR_NONE ) {
foreach( $this->WiderRegionData as $idx => $value ) {
$tag = $value["Festivity"]["tag"];
$this->WiderRegionData[$idx]["Festivity"]["name"] = $widerRegionI18nData[ $tag ];
}
} else {
$this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionDataFile ) . ": " . json_last_error_msg();
}
} else {
$this->Messages[] = sprintf( _( "Error retrieving and decoding Wider Region data from file %s." ), $widerRegionI18nFile ) . ": " . json_last_error_msg();
}
}
}
}
}

/**
* The LitCalEngine will only work once you call the public Init() method
* Do not change the order of the methods that follow,
Expand All @@ -2253,11 +2260,21 @@ public function Init(){
$this->initParameterData();
$this->loadDiocesanCalendarData();
$this->APICore->setResponseContentTypeHeader();

if( $this->cacheFileIsAvailable() ){
//If we already have done the calculation
//and stored the results in a cache file
//then we're done, just output this and die
echo file_get_contents( $this->CACHEFILE );
//or better, make the client use it's own cache copy!
$response = file_get_contents( $this->CACHEFILE );
$responseHash = md5( $response );
header("Etag: \"{$responseHash}\"");
if (!empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $responseHash) {
header( $_SERVER[ "SERVER_PROTOCOL" ] . " 304 Not Modified" );
header('Content-Length: 0');
} else {
echo $response;
}
die();
} else {
$this->dieIfBeforeMinYear();
Expand All @@ -2269,7 +2286,9 @@ public function Init(){
//$this->applyNationalCalendar();
switch( $this->LitSettings->NationalCalendar ){
case 'ITALY':
$this->applyCalendarItaly();
$this->loadNationalCalendarData();
$this->applyNationalCalendar();
//$this->applyCalendarItaly();
break;
case 'USA':
//I don't have any data before 2011
Expand Down

0 comments on commit df7e17d

Please sign in to comment.